diff -ur chuck-1.2.0.5~/src/makefile.alsa chuck-1.2.0.5/src/makefile.alsa --- chuck-1.2.0.5~/src/makefile.alsa 2006-06-24 01:38:24.000000000 +0200 +++ chuck-1.2.0.5/src/makefile.alsa 2006-06-24 13:31:55.000000000 +0200 @@ -1,9 +1,11 @@ -CXX=gcc +CC?=gcc +CXX?=g++ LEX=flex YACC=bison INCLUDES= -FLAGS=-D__LINUX_ALSA__ -O3 -c +CFLAGS?= -O3 +FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS) LIBS=-lasound -lstdc++ -ldl -lm SF_OBJ=util_sndfile.o @@ -46,7 +48,7 @@ $(CXX) -o chuck $(OBJS) $(LIBS) chuck.tab.o: chuck.tab.c - $(CXX) $(FLAGS) chuck.tab.c + $(CC) $(FLAGS) chuck.tab.c chuck.tab.c: chuck.y $(YACC) -dv -b chuck chuck.y @@ -55,7 +57,7 @@ echo "chuck.tab.h was created at the same time as chuck.tab.c" chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h - $(CXX) $(FLAGS) chuck.yy.c + $(CC) $(FLAGS) chuck.yy.c chuck.yy.c: chuck.lex $(LEX) -ochuck.yy.c chuck.lex @@ -181,19 +183,19 @@ $(CXX) $(FLAGS) util_console.cpp util_hid.o: util_hid.h util_hid.c - $(CXX) $(FLAGS) util_hid.c + $(CC) $(FLAGS) util_hid.c util_math.o: util_math.h util_math.c - $(CXX) $(FLAGS) util_math.c + $(CC) $(FLAGS) util_math.c util_network.o: util_network.h util_network.c - $(CXX) $(FLAGS) util_network.c + $(CC) $(FLAGS) util_network.c util_opsc.o: util_opsc.h util_opsc.cpp $(CXX) $(FLAGS) util_opsc.cpp util_raw.o: util_raw.h util_raw.c - $(CXX) $(FLAGS) util_raw.c + $(CC) $(FLAGS) util_raw.c util_string.o: util_string.h util_string.cpp $(CXX) $(FLAGS) util_string.cpp @@ -202,10 +204,10 @@ $(CXX) $(FLAGS) util_thread.cpp util_xforms.o: util_xforms.h util_xforms.c - $(CXX) $(FLAGS) util_xforms.c + $(CC) $(FLAGS) util_xforms.c util_sndfile.o: util_sndfile.h util_sndfile.c - $(CXX) $(FLAGS) util_sndfile.c + $(CC) $(FLAGS) util_sndfile.c clean: rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c diff -ur chuck-1.2.0.5~/src/makefile.jack chuck-1.2.0.5/src/makefile.jack --- chuck-1.2.0.5~/src/makefile.jack 2006-06-24 01:38:24.000000000 +0200 +++ chuck-1.2.0.5/src/makefile.jack 2006-06-24 13:32:22.000000000 +0200 @@ -1,9 +1,11 @@ -CXX=gcc +CC?=gcc +CXX?=g++ LEX=flex YACC=bison INCLUDES= -FLAGS=-D__LINUX_JACK__ -O3 -c +CFLAGS?= -O3 +FLAGS= -D__LINUX_JACK__ -c $(CFLAGS) LIBS=-lasound -ljack -lstdc++ -ldl -lm SF_OBJ=util_sndfile.o @@ -46,7 +48,7 @@ $(CXX) -o chuck $(OBJS) $(LIBS) chuck.tab.o: chuck.tab.c - $(CXX) $(FLAGS) chuck.tab.c + $(CC) $(FLAGS) chuck.tab.c chuck.tab.c: chuck.y $(YACC) -dv -b chuck chuck.y @@ -55,7 +57,7 @@ echo "chuck.tab.h was created at the same time as chuck.tab.c" chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h - $(CXX) $(FLAGS) chuck.yy.c + $(CC) $(FLAGS) chuck.yy.c chuck.yy.c: chuck.lex $(LEX) -ochuck.yy.c chuck.lex @@ -181,19 +183,19 @@ $(CXX) $(FLAGS) util_console.cpp util_hid.o: util_hid.h util_hid.c - $(CXX) $(FLAGS) util_hid.c + $(CC) $(FLAGS) util_hid.c util_math.o: util_math.h util_math.c - $(CXX) $(FLAGS) util_math.c + $(CC) $(FLAGS) util_math.c util_network.o: util_network.h util_network.c - $(CXX) $(FLAGS) util_network.c + $(CC) $(FLAGS) util_network.c util_opsc.o: util_opsc.h util_opsc.cpp $(CXX) $(FLAGS) util_opsc.cpp util_raw.o: util_raw.h util_raw.c - $(CXX) $(FLAGS) util_raw.c + $(CC) $(FLAGS) util_raw.c util_string.o: util_string.h util_string.cpp $(CXX) $(FLAGS) util_string.cpp @@ -202,10 +204,10 @@ $(CXX) $(FLAGS) util_thread.cpp util_xforms.o: util_xforms.h util_xforms.c - $(CXX) $(FLAGS) util_xforms.c + $(CC) $(FLAGS) util_xforms.c util_sndfile.o: util_sndfile.h util_sndfile.c - $(CXX) $(FLAGS) util_sndfile.c + $(CC) $(FLAGS) util_sndfile.c clean: rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c diff -ur chuck-1.2.0.5~/src/makefile.oss chuck-1.2.0.5/src/makefile.oss --- chuck-1.2.0.5~/src/makefile.oss 2006-06-24 01:38:24.000000000 +0200 +++ chuck-1.2.0.5/src/makefile.oss 2006-06-24 13:32:50.000000000 +0200 @@ -1,9 +1,11 @@ -CXX=gcc +CC?=gcc +CXX?=g++ LEX=flex YACC=bison INCLUDES= -FLAGS=-D__LINUX_OSS__ -O3 -c +CFLAGS?= -O3 +FLAGS= -D__LINUX_OSS__ -c $(CFLAGS) LIBS=-lpthread -lstdc++ -ldl -lm SF_OBJ=util_sndfile.o @@ -46,7 +48,7 @@ $(CXX) -o chuck $(OBJS) $(LIBS) chuck.tab.o: chuck.tab.c - $(CXX) $(FLAGS) chuck.tab.c + $(CC) $(FLAGS) chuck.tab.c chuck.tab.c: chuck.y $(YACC) -dv -b chuck chuck.y @@ -55,7 +57,7 @@ echo "chuck.tab.h was created at the same time as chuck.tab.c" chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h - $(CXX) $(FLAGS) chuck.yy.c + $(CC) $(FLAGS) chuck.yy.c chuck.yy.c: chuck.lex $(LEX) -ochuck.yy.c chuck.lex @@ -181,19 +183,19 @@ $(CXX) $(FLAGS) util_console.cpp util_hid.o: util_hid.h util_hid.c - $(CXX) $(FLAGS) util_hid.c + $(CC) $(FLAGS) util_hid.c util_math.o: util_math.h util_math.c - $(CXX) $(FLAGS) util_math.c + $(CC) $(FLAGS) util_math.c util_network.o: util_network.h util_network.c - $(CXX) $(FLAGS) util_network.c + $(CC) $(FLAGS) util_network.c util_opsc.o: util_opsc.h util_opsc.cpp $(CXX) $(FLAGS) util_opsc.cpp util_raw.o: util_raw.h util_raw.c - $(CXX) $(FLAGS) util_raw.c + $(CC) $(FLAGS) util_raw.c util_string.o: util_string.h util_string.cpp $(CXX) $(FLAGS) util_string.cpp @@ -202,10 +204,10 @@ $(CXX) $(FLAGS) util_thread.cpp util_xforms.o: util_xforms.h util_xforms.c - $(CXX) $(FLAGS) util_xforms.c + $(CC) $(FLAGS) util_xforms.c util_sndfile.o: util_sndfile.h util_sndfile.c - $(CXX) $(FLAGS) util_sndfile.c + $(CC) $(FLAGS) util_sndfile.c clean: rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c