[MPlayer-dev-eng] [PATCH] c++-compiler declaration not needed in libmpdemux/Makefile?

[Andreas Hess]

Hi,

this fixes the integration of the live.com RTP/RTSP stack with GCC 3.x
(at least) on Debian Woody.
Woody uses the following naming convention for the GCC:

	gcc 	-> GCC 2.95.4
	g++	-> GCC 2.95.4
	gcc-3.0	-> GCC 3.0.4
	g++-3.0 -> GCC 3.0.4

When configuring mplayer with '--cc=gcc-3.0' I have the problem, that
in libmpdemux/Makefile 'c++' is still hardcoded as the compiler for
the single cpp-file and 'c++' defaults to the old GCC version. So this
patch removes this declaration and uses $CC instead. This isn't a
problem because GCC is the frontend for all languages of the GCC
compiler collection.


Andreas
-------------- next part --------------
Index: libmpdemux/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- libmpdemux/Makefile 21 Aug 2002 21:31:20 -0000      1.33
+++ libmpdemux/Makefile 29 Aug 2002 22:02:28 -0000
@@ -22,7 +22,7 @@
 INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE)
 CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE)
-CPLUSPLUS = c++
+#CPLUSPLUS = c++

 .SUFFIXES: .c .cpp .o

@@ -33,7 +33,7 @@
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $<
 .cpp.o:
-       $(CPLUSPLUS) -c $(CPLUSPLUSFLAGS) -o $@ $<
+       $(CC) -c $(CPLUSPLUSFLAGS) -o $@ $<

 $(LIBNAME):    $(OBJS)
        $(AR) r $(LIBNAME) $(OBJS)