From: <spa...@us...> - 2012-05-14 20:06:05
|
Revision: 5857 http://sashimi.svn.sourceforge.net/sashimi/?rev=5857&view=rev Author: spacepod Date: 2012-05-14 20:05:59 +0000 (Mon, 14 May 2012) Log Message: ----------- Removing zlib from build prerequisites on OS X; otherwise on make will error out on OS X (no target for -lz). zlib is still included in the linker flags for os x X!Tandem. NOTE: if zlib is not needed for some special platform such as mingw, it would be cleanest to remove this logic and simply remove ZLIB_LIB from the xtandem prereq list in both TPP and extern/xtandem makefiles. Modified Paths: -------------- branches/4-6/trans_proteomic_pipeline/extern/xtandem/src_tpp/Makefile branches/4-6/trans_proteomic_pipeline/src/Makefile Modified: branches/4-6/trans_proteomic_pipeline/extern/xtandem/src_tpp/Makefile =================================================================== --- branches/4-6/trans_proteomic_pipeline/extern/xtandem/src_tpp/Makefile 2012-05-14 20:01:43 UTC (rev 5856) +++ branches/4-6/trans_proteomic_pipeline/extern/xtandem/src_tpp/Makefile 2012-05-14 20:05:59 UTC (rev 5857) @@ -109,7 +109,14 @@ #define the components of the program, and how to link them #these components are defined as dependencies; that is they must be up-to-date before the code is linked -$(EXECUTABLE): $(DEPS) $(OBJS) $(ZLIB_LIB) $(EXPAT_LIB) $(MZPARSER_LIB) $(HDF5_LIB) $(USER_OBJS) +ifneq (${ARCH},darwin) +XTANDEM_ZLIB_LIB=$(ZLIB_LIB) +else +# on os x 10.7, make will balk at "-lz" as a build dependency +XTANDEM_ZLIB_LIB= +endif + +$(EXECUTABLE): $(DEPS) $(OBJS) $(XTANDEM_ZLIB_LIB) $(EXPAT_LIB) $(MZPARSER_LIB) $(HDF5_LIB) $(USER_OBJS) $(LINKCC) $(CXXFLAGS) -o $(EXECUTABLE) $(OBJS) $(MZPARSER_LIB) $(HDF5_LIB) $(LDFLAGS) $(ZLIB_LIB) $(USER_OBJS) #specify the dep files depend on the cpp files Modified: branches/4-6/trans_proteomic_pipeline/src/Makefile =================================================================== --- branches/4-6/trans_proteomic_pipeline/src/Makefile 2012-05-14 20:01:43 UTC (rev 5856) +++ branches/4-6/trans_proteomic_pipeline/src/Makefile 2012-05-14 20:05:59 UTC (rev 5857) @@ -1095,7 +1095,14 @@ XTANDEM_SRCDIR = ../extern/xtandem/src_tpp -xtandem: $(EXPAT_LIB) $(ZLIB_LIB) $(HDF5_LIB) $(MZPARSER_BUILD) $(OBJ_ARCH)/TPPVersionInfo.o +ifneq (${ARCH},darwin) +XTANDEM_ZLIB_LIB=$(ZLIB_LIB) +else +# on os x 10.7, make will balk at "-lz" as a build dependency +XTANDEM_ZLIB_LIB= +endif + +xtandem: $(EXPAT_LIB) $(XTANDEM_ZLIB_LIB) $(HDF5_LIB) $(MZPARSER_BUILD) $(OBJ_ARCH)/TPPVersionInfo.o make -C $(XTANDEM_SRCDIR) TANDEM_PARAMETERS_INSTALL_DIR="${TANDEM_PARAMETERS_INSTALL_DIR}" SRC_ROOT="$(SRC_ROOT)" ARCH=$(ARCH) BUILD_DIR=$(OBJ_ARCH) EXPAT_LIB=$(EXPAT_LIB) ZLIB_INCL="$(ZLIB_INCL)" ZLIB_LIB="$(ZLIB_LIB)" HDF5_INCL="$(HDF5_INCL)" HDF5_LIB="$(HDF5_LIB)" MZPARSER_LIB="$(MZPARSER_BUILD)" MZPARSER_INCL="$(SRC_ROOT)Parsers/mzParser" USER_OBJS="$(OBJ_ARCH)/TPPVersionInfo.o" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |