From: <mho...@us...> - 2012-04-02 19:24:32
|
Revision: 5786 http://sashimi.svn.sourceforge.net/sashimi/?rev=5786&view=rev Author: mhoopmann Date: 2012-04-02 19:24:25 +0000 (Mon, 02 Apr 2012) Log Message: ----------- Fixed makefiles Modified Paths: -------------- trunk/trans_proteomic_pipeline/src/Makefile trunk/trans_proteomic_pipeline/src/Makefile.incl trunk/trans_proteomic_pipeline/src/Parsers/mzParser/Makefile Modified: trunk/trans_proteomic_pipeline/src/Makefile =================================================================== --- trunk/trans_proteomic_pipeline/src/Makefile 2012-04-02 18:19:57 UTC (rev 5785) +++ trunk/trans_proteomic_pipeline/src/Makefile 2012-04-02 19:24:25 UTC (rev 5786) @@ -1044,6 +1044,8 @@ $(OBJ_ARCH)/mzp_base64.mzp.o : mzp_base64.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h +$(OBJ_ARCH)/BasicChromatogram.mzp.o : BasicChromatogram.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h + $(OBJ_ARCH)/BasicSpectrum.mzp.o : BasicSpectrum.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h $(OBJ_ARCH)/saxhandler.mzp.o : saxhandler.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h @@ -1056,6 +1058,8 @@ $(OBJ_ARCH)/RAMPface.mzp.o : $(OBJ_ARCH)/saxhandler.mzp.o $(OBJ_ARCH)/saxmzxmlhandler.mzp.o $(OBJ_ARCH)/saxmzmlhandler.mzp.o $(OBJ_ARCH)/mz5handler.mzp.o saxmzmlhandler.cpp saxmzxmlhandler.cpp saxhandler.cpp RAMPface.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h +$(OBJ_ARCH)/PWIZface.mzp.o : $(OBJ_ARCH)/BasicChromatogram.mzp.o $(OBJ_ARCH)/saxhandler.mzp.o $(OBJ_ARCH)/saxmzxmlhandler.mzp.o $(OBJ_ARCH)/saxmzmlhandler.mzp.o $(OBJ_ARCH)/mz5handler.mzp.o BasicChromatogram.cpp saxmzmlhandler.cpp saxmzxmlhandler.cpp saxhandler.cpp PWIZface.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h + $(OBJ_ARCH)/mzParser.mzp.o : mzParser.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h $(OBJ_ARCH)/Czran.mzp.o : Czran.cpp $(SRC_ROOT)Parsers/mzParser/mzParser.h Modified: trunk/trans_proteomic_pipeline/src/Makefile.incl =================================================================== --- trunk/trans_proteomic_pipeline/src/Makefile.incl 2012-04-02 18:19:57 UTC (rev 5785) +++ trunk/trans_proteomic_pipeline/src/Makefile.incl 2012-04-02 19:24:25 UTC (rev 5786) @@ -462,7 +462,9 @@ MZPARSER_BUILD = $(OBJ_ARCH)/libmzparser.a MZPARSER_OBJS= $(OBJ_ARCH)/RAMPface.mzp.o \ + $(OBJ_ARCH)/PWIZface.mzp.o \ $(OBJ_ARCH)/mzp_base64.mzp.o \ + $(OBJ_ARCH)/BasicChromatogram.o \ $(OBJ_ARCH)/BasicSpectrum.mzp.o \ $(OBJ_ARCH)/Czran.mzp.o \ $(OBJ_ARCH)/mzp_cached_ramp.mzp.o \ Modified: trunk/trans_proteomic_pipeline/src/Parsers/mzParser/Makefile =================================================================== --- trunk/trans_proteomic_pipeline/src/Parsers/mzParser/Makefile 2012-04-02 18:19:57 UTC (rev 5785) +++ trunk/trans_proteomic_pipeline/src/Parsers/mzParser/Makefile 2012-04-02 19:24:25 UTC (rev 5786) @@ -46,11 +46,15 @@ ###################################################################### OBJS= ${ARCH}/mzp_base64.o \ + ${ARCH}/BasicChromatogram.o \ ${ARCH}/BasicSpectrum.o \ ${ARCH}/saxhandler.o \ ${ARCH}/saxmzmlhandler.o \ ${ARCH}/saxmzxmlhandler.o \ ${ARCH}/mz5handler.o \ + ${ARCH}/mzpMz5Config.o \ + ${ARCH}/mzpMz5Structs.o \ + ${ARCH}/PWIZface.o \ ${ARCH}/RAMPface.o \ ${ARCH}/Czran.o \ ${ARCH}/mzParser.o @@ -89,11 +93,15 @@ # dependencies # ${ARCH}/mzp_base64.o : mzp_base64.cpp mzParser.h +${ARCH}/BasicChromatogram.o : BasicChromatogram.cpp mzParser.h ${ARCH}/BasicSpectrum.o : BasicSpectrum.cpp mzParser.h ${ARCH}/saxhandler.o : saxhandler.cpp mzParser.h ${ARCH}/saxmzmlhandler.o : saxhandler.cpp saxmzmlhandler.cpp mzParser.h ${ARCH}/saxmzxmlhandler.o : saxhandler.cpp saxmzxmlhandler.cpp mzParser.h ${ARCH}/mz5handler.o : mzpMz5Config.cpp mzpMz5Structs.cpp mz5handler.cpp mzParser.h +${ARCH}/mzpMz5Config.o : mzpMz5Config.cpp mzParser.h +${ARCH}/mzpMz5Structs.o : mzpMz5Structs.cpp mzParser.h +${ARCH}/PWIZface.o : saxhandler.cpp saxmzmlhandler.cpp mz5handler.cpp PWIZface.cpp mzParser.h ${ARCH}/RAMPface.o : saxhandler.cpp saxmzmlhandler.cpp saxmzxmlhandler.cpp mz5handler.cpp RAMPface.cpp mzParser.h ${ARCH}/Czran.o : Czran.cpp mzParser.h ${ARCH}/mzParser.o : mzParser.cpp mzParser.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |