1. Rdisop
  2. Commit 3ab639d5f7c8afceb27f38c45325c04f062eb1a6
Browse code

Remove unneccessary lines from Makefile, remove windows specific one altogether

Steffen Neumann authored on 02/04/2019 22:40:48
Showing 2 changed files
src/Makevars
History View file @ 3ab639d
... ... 
@@ -1,5 +1,3 @@
1 
-
2 
-
3 1 
 PKG_CXXFLAGS=-I./imslib/src/
4 2
5 3 
 PKG_LIBS=`${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()"` `${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
... ... 
@@ -13,33 +11,6 @@ DISOPOBJECTS=disop.o
13 11
14 12 
 OBJECTS=$(DISOPOBJECTS) $(IMSOBJECTS)
15 13
16 
-#imslib/src/libims.la:
17 
-#	(cd imslib; ./configure --enable-shared --disable-static; make src/libims.la)
18 
-
19 
-imslib/src/ims/element.o: imslib/src/ims/element.cpp
20 
-imslib/src/ims/composedelement.o: imslib/src/ims/composedelement.cpp
21 
-imslib/src/ims/isotopedistribution.o: imslib/src/ims/isotopedistribution.cpp
22 
-imslib/src/ims/alphabet.o: imslib/src/ims/alphabet.cpp
23 
-imslib/src/ims/weights.o: imslib/src/ims/weights.cpp
24 
-imslib/src/ims/distributedalphabet.o: imslib/src/ims/distributedalphabet.cpp
25 
-imslib/src/ims/transformation.o: imslib/src/ims/transformation.cpp
26 
-imslib/src/ims/isotopespecies.o: imslib/src/ims/isotopespecies.cpp
27 
-imslib/src/ims/base/parser/alphabettextparser.o: imslib/src/ims/base/parser/alphabettextparser.cpp
28 
-imslib/src/ims/base/parser/distributedalphabettextparser.o: imslib/src/ims/base/parser/distributedalphabettextparser.cpp
29 
-imslib/src/ims/base/parser/massestextparser.o: imslib/src/ims/base/parser/massestextparser.cpp
30 
-imslib/src/ims/base/parser/moleculesequenceparser.o: imslib/src/ims/base/parser/moleculesequenceparser.cpp
31 
-imslib/src/ims/base/parser/standardmoleculesequenceparser.o: imslib/src/ims/base/parser/standardmoleculesequenceparser.cpp
32 
-imslib/src/ims/base/parser/keggligandcompoundsparser.o: imslib/src/ims/base/parser/keggligandcompoundsparser.cpp
33 
-imslib/src/ims/base/parser/moleculeionchargemodificationparser.o: imslib/src/ims/base/parser/moleculeionchargemodificationparser.cpp
34 
-imslib/src/ims/calib/linepairstabber.o: imslib/src/ims/calib/linepairstabber.cpp
35 
-imslib/src/ims/calib/matchmatrix.o: imslib/src/ims/calib/matchmatrix.cpp
36 
-imslib/src/ims/calib/linearpointsetmatcher.o: imslib/src/ims/calib/linearpointsetmatcher.cpp
37 
-imslib/src/ims/decomp/realmassdecomposer.o: imslib/src/ims/decomp/realmassdecomposer.cpp
38 
-imslib/src/ims/utils/distribution.o: imslib/src/ims/utils/distribution.cpp
39 
-imslib/src/ims/distributionprobabilityscorer.o: imslib/src/ims/distributionprobabilityscorer.cpp
40 
-imslib/src/ims/characteralphabet.o: imslib/src/ims/characteralphabet.cpp
41 
-imslib/src/ims/nitrogenrulefilter.o: imslib/src/ims/nitrogenrulefilter.cpp
42 
-
43 14 
 clean:
44 15 
 	$(MAKE) -C imslib clean
45 16 
 	rm -f $(OBJECTS)
src/Makevars.win
History View file @ 3ab639d
46 17 
deleted file mode 100755
... ... 
@@ -1,45 +0,0 @@
1 
-# PKG_CXXFLAGS+= -I../RcppSrc -I./imslib/src/
2 
-# PKG_LIBS+= -L../RcppSrc -lRcpp
3 
-
4 
-PKG_CXXFLAGS+= -I./imslib/src/
5 
-
6 
-PKG_LIBS=`${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()" ` `${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
7 
-
8 
-
9 
-.PHONY: all
10 
-all: $(SHLIB)
11 
-
12 
-IMSOBJECTS=imslib/src/ims/element.o imslib/src/ims/composedelement.o imslib/src/ims/isotopedistribution.o imslib/src/ims/alphabet.o imslib/src/ims/weights.o imslib/src/ims/distributedalphabet.o imslib/src/ims/transformation.o imslib/src/ims/isotopespecies.o imslib/src/ims/base/parser/alphabettextparser.o imslib/src/ims/base/parser/distributedalphabettextparser.o imslib/src/ims/base/parser/massestextparser.o imslib/src/ims/base/parser/moleculesequenceparser.o imslib/src/ims/base/parser/standardmoleculesequenceparser.o imslib/src/ims/base/parser/keggligandcompoundsparser.o imslib/src/ims/base/parser/moleculeionchargemodificationparser.o imslib/src/ims/calib/linepairstabber.o imslib/src/ims/calib/matchmatrix.o imslib/src/ims/calib/linearpointsetmatcher.o imslib/src/ims/decomp/realmassdecomposer.o imslib/src/ims/utils/distribution.o imslib/src/ims/distributionprobabilityscorer.o imslib/src/ims/characteralphabet.o imslib/src/ims/nitrogenrulefilter.o
13 
-
14 
-DISOPOBJECTS=disop.o
15 
-
16 
-OBJECTS=$(DISOPOBJECTS) $(IMSOBJECTS)
17 
-
18 
-imslib/src/ims/element.o: imslib/src/ims/element.cpp
19 
-imslib/src/ims/composedelement.o: imslib/src/ims/composedelement.cpp
20 
-imslib/src/ims/isotopedistribution.o: imslib/src/ims/isotopedistribution.cpp
21 
-imslib/src/ims/alphabet.o: imslib/src/ims/alphabet.cpp
22 
-imslib/src/ims/weights.o: imslib/src/ims/weights.cpp
23 
-imslib/src/ims/distributedalphabet.o: imslib/src/ims/distributedalphabet.cpp
24 
-imslib/src/ims/transformation.o: imslib/src/ims/transformation.cpp
25 
-imslib/src/ims/isotopespecies.o: imslib/src/ims/isotopespecies.cpp
26 
-imslib/src/ims/base/parser/alphabettextparser.o: imslib/src/ims/base/parser/alphabettextparser.cpp
27 
-imslib/src/ims/base/parser/distributedalphabettextparser.o: imslib/src/ims/base/parser/distributedalphabettextparser.cpp
28 
-imslib/src/ims/base/parser/massestextparser.o: imslib/src/ims/base/parser/massestextparser.cpp
29 
-imslib/src/ims/base/parser/moleculesequenceparser.o: imslib/src/ims/base/parser/moleculesequenceparser.cpp
30 
-imslib/src/ims/base/parser/standardmoleculesequenceparser.o: imslib/src/ims/base/parser/standardmoleculesequenceparser.cpp
31 
-imslib/src/ims/base/parser/keggligandcompoundsparser.o: imslib/src/ims/base/parser/keggligandcompoundsparser.cpp
32 
-imslib/src/ims/base/parser/moleculeionchargemodificationparser.o: imslib/src/ims/base/parser/moleculeionchargemodificationparser.cpp
33 
-imslib/src/ims/calib/linepairstabber.o: imslib/src/ims/calib/linepairstabber.cpp
34 
-imslib/src/ims/calib/matchmatrix.o: imslib/src/ims/calib/matchmatrix.cpp
35 
-imslib/src/ims/calib/linearpointsetmatcher.o: imslib/src/ims/calib/linearpointsetmatcher.cpp
36 
-imslib/src/ims/decomp/realmassdecomposer.o: imslib/src/ims/decomp/realmassdecomposer.cpp
37 
-imslib/src/ims/utils/distribution.o: imslib/src/ims/utils/distribution.cpp
38 
-imslib/src/ims/distributionprobabilityscorer.o: imslib/src/ims/distributionprobabilityscorer.cpp
39 
-imslib/src/ims/characteralphabet.o: imslib/src/ims/characteralphabet.cpp
40 
-imslib/src/ims/nitrogenrulefilter.o: imslib/src/ims/nitrogenrulefilter.cpp
41 
-
42 
-clean:
43 
-	$(MAKE) -C imslib clean
44 
-	rm -f $(OBJECTS)
45 
-