comparison Makefile @ 370:2d5c3f8e8c22

Merge gcc-4.3-cleanups branch (-r629:642, but I consider that branch as having served its purpose) onto the trunk. Now compiles cleanly even with a fairly picky gcc. I await version 4.4 with bated breath.
author mas01cr
date Wed, 12 Nov 2008 15:40:40 +0000
parents 94c18f128ce8
children 5eb5034b0577
comparison
equal deleted inserted replaced
355:94c18f128ce8 370:2d5c3f8e8c22
48 48
49 cmdline.o: cmdline.c cmdline.h 49 cmdline.o: cmdline.c cmdline.h
50 gcc -c $(CFLAGS) $< 50 gcc -c $(CFLAGS) $<
51 51
52 52
53 $(EXECUTABLE): cmdline.c $(OBJS) soapServer.cpp soapClient.cpp soapC.cpp 53 $(EXECUTABLE): cmdline.o $(OBJS) soapServer.cpp soapClient.cpp soapC.cpp
54 g++ -c $(CFLAGS) $(GSOAP_INCLUDE) -Wall audioDB.cpp -DBINARY 54 g++ -c $(CFLAGS) $(GSOAP_INCLUDE) -Wall audioDB.cpp -DBINARY
55 g++ -o $(EXECUTABLE) $(CFLAGS) audioDB.o $^ $(LIBGSL) $(GSOAP_INCLUDE) $(GSOAP_CPP) 55 g++ -o $(EXECUTABLE) $(CFLAGS) audioDB.o $^ $(LIBGSL) $(GSOAP_INCLUDE) $(GSOAP_CPP)
56 56
57 57
58 $(LIBRARY): cmdline.c $(LIBOBJS) 58 $(LIBRARY): cmdline.o $(LIBOBJS)
59 g++ -c $(CFLAGS) $(GSOAP_INCLUDE) -Wall audioDB.cpp 59 g++ -c $(CFLAGS) -Wall audioDB.cpp
60 g++ -shared -o $(LIBRARY) $(CFLAGS) $(LIBGSL) audioDB.o $^ 60 g++ -shared -o $(LIBRARY) $(CFLAGS) $(LIBGSL) audioDB.o $^
61 61
62 tags: 62 tags:
63 ctags *.cpp *.h 63 ctags *.cpp *.h
64 64