diff Makefile @ 204:2ea1908707c7 refactoring

Filewise refactor. Break apart huge monolithic audioDB.cpp file into seven broadly independent portions: * SOAP * DB creation * insertion * query * dump * common functionality * constructor functions Remove the "using namespace std" from the header file, though that wasn't actually a problem: the problem in question is solved by including adb.nsmap in only soap.cpp. Makefile improvements.
author mas01cr
date Wed, 28 Nov 2007 15:10:28 +0000
parents 324699d56429
children 9fcc8e97c86f
line wrap: on
line diff
--- a/Makefile	Wed Nov 28 12:35:09 2007 +0000
+++ b/Makefile	Wed Nov 28 15:10:28 2007 +0000
@@ -21,19 +21,21 @@
 cmdline.c cmdline.h: gengetopt.in
 	${GENGETOPT} -e <gengetopt.in
 
-soapServer.cpp soapClient.cpp soapC.cpp: audioDBws.h
+soapServer.cpp soapClient.cpp soapC.cpp adb.nsmap: audioDBws.h
 	${SOAPCPP2} audioDBws.h
 
-${EXECUTABLE}: audioDB.cpp audioDB.h soapServer.cpp soapClient.cpp soapC.cpp cmdline.c cmdline.h
-	g++ -c ${CFLAGS} ${GSOAP_INCLUDE} -Wall -Werror audioDB.cpp
-	g++ -o ${EXECUTABLE} ${CFLAGS} ${GSOAP_INCLUDE} audioDB.o soapServer.cpp soapClient.cpp soapC.cpp cmdline.c ${GSOAP_CPP}
+%.o: %.cpp audioDB.h adb.nsmap cmdline.h
+	g++ -c ${CFLAGS} ${GSOAP_INCLUDE} -Wall -Werror $<
+
+${EXECUTABLE}: insert.o create.o common.o dump.o query.o soap.o audioDB.o soapServer.cpp soapClient.cpp soapC.cpp cmdline.c
+	g++ -o ${EXECUTABLE} ${CFLAGS} ${GSOAP_INCLUDE} $^ ${GSOAP_CPP}
 
 clean:
 	-rm cmdline.c cmdline.h
 	-rm soapServer.cpp soapClient.cpp soapC.cpp soapObject.h soapStub.h soapProxy.h soapH.h soapServerLib.cpp soapClientLib.cpp
-	-rm adb.nsmap adb.xsd adb.wsdl adb.query.req.xml adb.query.res.xml adb.status.req.xml adb.status.res.xml
+	-rm adb.nsmap adb.xsd adb.wsdl adb.*.req.xml adb.*.res.xml
 	-rm HELP.txt
-	-rm ${EXECUTABLE} ${EXECUTABLE}.1 audioDB.o
+	-rm ${EXECUTABLE} ${EXECUTABLE}.1 audioDB.o insert.o create.o common.o dump.o query.o soap.o
 	-sh -c "cd tests && sh ./clean.sh"
 
 test: ${EXECUTABLE}