From: <ds...@us...> - 2015-10-30 03:27:58
|
Revision: 7100 http://sourceforge.net/p/sashimi/code/7100 Author: dshteyn Date: 2015-10-30 03:27:55 +0000 (Fri, 30 Oct 2015) Log Message: ----------- nettle lib dependency Modified Paths: -------------- trunk/trans_proteomic_pipeline/src/Makefile trunk/trans_proteomic_pipeline/src/Makefile.incl Modified: trunk/trans_proteomic_pipeline/src/Makefile =================================================================== --- trunk/trans_proteomic_pipeline/src/Makefile 2015-10-29 20:12:44 UTC (rev 7099) +++ trunk/trans_proteomic_pipeline/src/Makefile 2015-10-30 03:27:55 UTC (rev 7100) @@ -853,7 +853,7 @@ _Mascot2XML : $(OBJ_ARCH)/Mascot2XML $(OBJ_ARCH)/Mascot2XML : $(OBJ_ARCH)/MascotConverterMain.o $(OBJ_ARCH)/MascotConverter.o $(OBJ_ARCH)/MascotModification.o $(TPPLIB) $(LIBARCHIVE) - $(LD) $(DEBUG) $(OPT) -o $@ $^ $(LDFLAGS) $(BZ2_LIB) $(ICONV_LIB) $(LZO2_LIB) $(LZMA_LIB) -lz + $(LD) $(DEBUG) $(OPT) -o $@ $^ $(LDFLAGS) $(BZ2_LIB) $(ICONV_LIB) $(LZO2_LIB) $(LZMA_LIB) $(NETTLE_LIB) -lz # build archive library? ifeq (${ARCH_FAMILY},mingw) @@ -907,7 +907,7 @@ _sequest-tgz-out.cgi : $(OBJ_ARCH)/sequest-tgz-out.cgi $(OBJ_ARCH)/sequest-tgz-out.cgi : $(OBJ_ARCH)/sequest-tgz-out1.o $(TPPLIB) $(LIBARCHIVE) - $(LD) $(DEBUG) $(OPT) -o $@ $^ $(LDFLAGS) $(BZ2_LIB) $(ICONV_LIB) $(LZO2_LIB) $(LZMA_LIB) -lz + $(LD) $(DEBUG) $(OPT) -o $@ $^ $(LDFLAGS) $(BZ2_LIB) $(ICONV_LIB) $(LZO2_LIB) $(LZMA_LIB) $(NETTLE_LIB) -lz _cometresult.cgi : $(OBJ_ARCH)/cometresult.cgi Modified: trunk/trans_proteomic_pipeline/src/Makefile.incl =================================================================== --- trunk/trans_proteomic_pipeline/src/Makefile.incl 2015-10-29 20:12:44 UTC (rev 7099) +++ trunk/trans_proteomic_pipeline/src/Makefile.incl 2015-10-30 03:27:55 UTC (rev 7100) @@ -105,6 +105,7 @@ ICONV_LIB=-liconv LZO2_LIB=-llzo2 LZMA_LIB=-llzma +NETTLE_LIB=-lnettle BZ2_LIB=-lbz2 #ZLIB_INCL= -I $(SRC_ROOT)../extern/zlib125-dll/include -I $(SRC_ROOT)../extern/zlib125-dll #ZLIB_LIB= $(SRC_ROOT)../extern/zlib125-dll/lib/zdll.lib @@ -161,6 +162,7 @@ ICONV_LIB= LZO2_LIB= +NETTLE_LIB= LZMA_LIB= #ZLIB_INCL= #ZLIB_LIBS= -lz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |