Patch to build static and shared object version of the library the Debian way. diff --git a/Makefile b/Makefile index 8f8f087..76aa285 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,5 @@ #Set your paths here. -ZLIB_PATH = ./src/zlib-1.2.8 MZPARSER_PATH = ./src/mzParser -EXPAT_PATH = ./src/expat-2.2.0 -SQLITE_PATH = ./src/sqlite-3.7.7.1 MST_PATH = ./src/MSToolkit HEADER_PATH = ./include @@ -11,69 +8,63 @@ MZPARSER = mzp.MSNumpress.o mzp.mzp_base64.o mzp.BasicSpectrum.o mzp.mzParser.o mzp.saxmzxmlhandler.o mzp.Czran.o mzp.mz5handler.o mzp.mzpMz5Config.o mzp.mzpMz5Structs.o mzp.BasicChromatogram.o mzp.PWIZface.o MZPARSERLITE = mzp.MSNumpress.o mzp.mzp_base64_lite.o mzp.BasicSpectrum_lite.o mzp.mzParser_lite.o mzp.RAMPface_lite.o mzp.saxhandler_lite.o mzp.saxmzmlhandler_lite.o \ mzp.saxmzxmlhandler_lite.o mzp.Czran_lite.o mzp.mz5handler_lite.o mzp.mzpMz5Config_lite.o mzp.mzpMz5Structs_lite.o mzp.BasicChromatogram_lite.o mzp.PWIZface_lite.o -EXPAT = xmlparse.o xmlrole.o xmltok.o -ZLIB = adler32.o compress.o crc32.o deflate.o inffast.o inflate.o infback.o inftrees.o trees.o uncompr.o zutil.o MSTOOLKIT = Spectrum.o MSObject.o mzMLWriter.o pepXMLWriter.o READER = MSReader.o READERLITE = MSReaderLite.o -SQLITE = sqlite3.o CC = g++ GCC = gcc NOSQLITE = -D_NOSQLITE -CFLAGS = -O3 -static -I. -I$(HEADER_PATH) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H -LIBS = -lm -lpthread -ldl +SOVER = 82 +RELVER = $(SOVER).0.0 -all: $(ZLIB) $(MZPARSER) $(MZPARSERLITE) $(MSTOOLKIT) $(READER) $(READERLITE) $(EXPAT) $(SQLITE) - ar rcs libmstoolkitlite.a $(ZLIB) $(EXPAT) $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE) - ar rcs libmstoolkit.a $(ZLIB) $(EXPAT) $(MZPARSER) $(MSTOOLKIT) $(READER) $(SQLITE) -# $(CC) $(CFLAGS) MSTDemo.cpp -L. -lmstoolkitlite -o MSTDemo - $(CC) $(CFLAGS) -I./include MSSingleScan/MSSingleScan.cpp -L. -lmstoolkitlite -o msSingleScan -# $(CC) $(CFLAGS) MSConvertFile.cpp -L. -lmstoolkitlite -o MSConvertFile - -lite: $(ZLIB) $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE) $(EXPAT) - ar rcs libmstoolkitlite.a $(ZLIB) $(EXPAT) $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE) - $(CC) $(CFLAGS) -I./include MSSingleScan/MSSingleScan.cpp -L. -lmstoolkitlite -o msSingleScan - -clean: - rm -f *.o libmstoolkitlite.a libmstoolkit.a msSingleScan - -# zLib objects - -adler32.o : $(ZLIB_PATH)/adler32.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/adler32.c -c +AR_CFLAGS = -O3 -static -g -I. -I$(HEADER_PATH) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H +SO_CFLAGS = -O3 -shared -fPIC -g -I. -I$(HEADER_PATH) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H -compress.o : $(ZLIB_PATH)/compress.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/compress.c -c +LIBS = -lm -lpthread -ldl -lz -lsqlite3 -lexpat -crc32.o : $(ZLIB_PATH)/crc32.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/crc32.c -c +CLEAN_LIBS = libmstoolkitlite.a libmstoolkitlite.so libmstoolkitlite.so.$(SOVER)* libmstoolkit.a libmstoolkit.so libmstoolkit.so.$(SOVER)* -deflate.o : $(ZLIB_PATH)/deflate.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/deflate.c -c +all: + make arlib + make solib -inffast.o : $(ZLIB_PATH)/inffast.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/inffast.c -c +.PHONY: objects +objects: $(MZPARSER) $(MZPARSERLITE) $(MSTOOLKIT) $(READER) $(READERLITE) -inflate.o : $(ZLIB_PATH)/inflate.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/inflate.c -c +arlib: CFLAGS = $(AR_CFLAGS) +arlib: clean_objects objects + + ar rcs libmstoolkitlite.a $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE) + ar rcs libmstoolkit.a $(MZPARSER) $(MSTOOLKIT) $(READER) +# $(CC) $(CFLAGS) MSTDemo.cpp -L. -lmstoolkitlite -o MSTDemo +# $(CC) $(CFLAGS) -I./include MSSingleScan/MSSingleScan.cpp -L. -lmstoolkitlite -o msSingleScan.static +# $(CC) $(CFLAGS) MSConvertFile.cpp -L. -lmstoolkitlite -o MSConvertFile -infback.o : $(ZLIB_PATH)/infback.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/infback.c -c -inftrees.o : $(ZLIB_PATH)/inftrees.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/inftrees.c -c +solib: CFLAGS = $(SO_CFLAGS) +solib: clean_objects objects + + $(CC) $(CFLAGS) -o libmstoolkitlite.so.$(RELVER) -Wl,-z,relro -Wl,-soname,libmstoolkitlite.so.$(SOVER) $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE) $(LIBS) + ln -sf libmstoolkitlite.so.$(RELVER) libmstoolkitlite.so.$(SOVER) + ln -sf libmstoolkitlite.so.$(SOVER) libmstoolkitlite.so + + $(CC) $(CFLAGS) -o libmstoolkit.so.$(RELVER) -Wl,-z,relro -Wl,-soname,libmstoolkit.so.$(SOVER) $(MZPARSER) $(MSTOOLKIT) $(READER) $(LIBS) + ln -sf libmstoolkit.so.$(RELVER) libmstoolkit.so.$(SOVER) + ln -sf libmstoolkit.so.$(SOVER) libmstoolkit.so + + # Be careful not to include in the linker command line below the compilation -shared -fPIC flags! + $(CC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H -I./include -L. MSSingleScan/MSSingleScan.cpp -o msSingleScan $(LIBS) -lmstoolkitlite -trees.o : $(ZLIB_PATH)/trees.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/trees.c -c -uncompr.o : $(ZLIB_PATH)/uncompr.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/uncompr.c -c +clean_objects: + rm -f *.o msSingleScan.* -zutil.o : $(ZLIB_PATH)/zutil.c - $(GCC) $(CFLAGS) $(ZLIB_PATH)/zutil.c -c +clean_libs: + rm -f $(CLEAN_LIBS) +clean: clean_libs clean_objects #mzParser objects @@ -85,23 +76,6 @@ mzp.%_lite.o : $(MZPARSER_PATH)/%.cpp $(CC) $(CFLAGS) $< -c -o $@ -#expat objects -xmlparse.o : $(EXPAT_PATH)/xmlparse.c - $(GCC) $(CFLAGS) $(EXPAT_PATH)/xmlparse.c -c -xmlrole.o : $(EXPAT_PATH)/xmlrole.c - $(GCC) $(CFLAGS) $(EXPAT_PATH)/xmlrole.c -c -xmltok.o : $(EXPAT_PATH)/xmltok.c - $(GCC) $(CFLAGS) $(EXPAT_PATH)/xmltok.c -c - - - -#SQLite object -sqlite3.o : $(SQLITE_PATH)/sqlite3.c - $(GCC) $(CFLAGS) $(SQLITE_PATH)/sqlite3.c -c - - - - #MSToolkit objects Spectrum.o : $(MST_PATH)/Spectrum.cpp @@ -123,6 +97,3 @@ pepXMLWriter.o : $(MST_PATH)/pepXMLWriter.cpp $(CC) $(CFLAGS) $(MST_PATH)/pepXMLWriter.cpp -c - - -