Mercurial > hg > audiodb
changeset 138:c337813dcbda
Make the Makefile sufficiently generic to be usable on OS X.
Document the necessary command line in INSTALL.txt
Delete the now unnecessary Makefile.osx and Makefile.win32 files.
| author | mas01cr |
|---|---|
| date | Wed, 24 Oct 2007 13:29:30 +0000 |
| parents | ddeb172359a8 |
| children | 7c7072a8626a |
| files | INSTALL.txt Makefile Makefile.osx Makefile.win32 |
| diffstat | 4 files changed, 15 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/INSTALL.txt Wed Oct 24 11:57:20 2007 +0000 +++ b/INSTALL.txt Wed Oct 24 13:29:30 2007 +0000 @@ -14,6 +14,14 @@ Use the following Makefiles to compile audioDB on your system: -Linux: Makefile -Mac OS X: Makefile.osx -Win32: Makefile.win32 +Linux: make +(Debian-derived systems, with the right versions of gengetopt, gsoap +and help2man installed) + +OS X or Win32: make \ + GENGETOPT=/path/to/bin/gengetopt \ + SOAPCPP2=/path/to/bin/soapcpp2 \ + GSOAP_CPP=/path/to/gsoap/stdsoap2.cpp \ + GSOAP_INCLUDE="-I /path/to/gsoap" +(where the path in GSOAP_INCLUDE should name the directory in which +stdsoap.h resides)
--- a/Makefile Wed Oct 24 11:57:20 2007 +0000 +++ b/Makefile Wed Oct 24 13:29:30 2007 +0000 @@ -1,14 +1,13 @@ HELP2MAN=help2man GENGETOPT=gengetopt SOAPCPP2=soapcpp2 +GSOAP_CPP=-lgsoap++ +GSOAP_INCLUDE= CFLAGS=-O3 -g -GSOAP_CPP=-lgsoap++ - EXECUTABLE=audioDB - .PHONY: all clean test all: ${EXECUTABLE} @@ -26,8 +25,8 @@ ${SOAPCPP2} audioDBws.h ${EXECUTABLE}: audioDB.cpp audioDB.h soapServer.cpp soapClient.cpp soapC.cpp cmdline.c cmdline.h - g++ -c ${CFLAGS} -Wall -Werror audioDB.cpp - g++ -o ${EXECUTABLE} ${CFLAGS} audioDB.o soapServer.cpp soapClient.cpp soapC.cpp cmdline.c ${GSOAP_CPP} + 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} clean: -rm cmdline.c cmdline.h
--- a/Makefile.osx Wed Oct 24 11:57:20 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - -CFLAGS=-O3 -LIBDIR= -LIBS= -SOAPDIR=bin_x86_osx/soapcpp-macosx-2.1.6 -SOAPOBS=${SOAPDIR}/stdsoap2.o soapServer.cpp soapClient.cpp soapC.cpp -CMDOBS=cmdline.c -INCDIR=-I${SOAPDIR} - -all: audioDB.h audioDB.cpp ${SOAPOBS} ${CMDOBS} Makefile.osx - ${SOAPDIR}/soapcpp2 audioDBws.h - g++ -o audioDB ${CFLAGS} audioDB.cpp ${SOAPOBS} ${CMDOBS} ${CFLAGS} ${INCDIR} ${LIBDIR} ${LIBS}
--- a/Makefile.win32 Wed Oct 24 11:57:20 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -CFLAGS=-ggdb -LIBDIR= -LIBS= -SOAPDIR=bin_x86_win/gsoap-win32-2.7 -SOAPOBS=${SOAPDIR}/stdsoap2.o soapServer.cpp soapClient.cpp soapC.cpp -INCDIR=-I${SOAPDIR} - -all: audioDB.h audioDB.cpp ${SOAPOBS} Makefile.win32 - ${SOAPDIR}/soapcpp2 audioDBws.h - g++ -o audioDB ${CFLAGS} audioDB.cpp ${SOAPOBS} ${CFLAGS} ${INCDIR} ${LIBDIR} ${LIBS}