Mercurial > hg > audiodb

diff Makefile @ 370:2d5c3f8e8c22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/Makefile	Wed Nov 12 10:21:06 2008 +0000
+++ b/Makefile	Wed Nov 12 15:40:40 2008 +0000
@@ -50,13 +50,13 @@
 	gcc -c $(CFLAGS) $<
 
 
-$(EXECUTABLE): cmdline.c $(OBJS) soapServer.cpp soapClient.cpp soapC.cpp
+$(EXECUTABLE): cmdline.o $(OBJS) soapServer.cpp soapClient.cpp soapC.cpp
 	g++ -c $(CFLAGS) $(GSOAP_INCLUDE) -Wall audioDB.cpp -DBINARY
 	g++ -o $(EXECUTABLE) $(CFLAGS) audioDB.o $^ $(LIBGSL) $(GSOAP_INCLUDE) $(GSOAP_CPP)
 
 
-$(LIBRARY): cmdline.c $(LIBOBJS)
-	g++ -c $(CFLAGS) $(GSOAP_INCLUDE) -Wall audioDB.cpp
+$(LIBRARY): cmdline.o $(LIBOBJS)
+	g++ -c $(CFLAGS) -Wall audioDB.cpp
 	g++ -shared -o $(LIBRARY) $(CFLAGS) $(LIBGSL) audioDB.o $^ 
 
 tags: