Browse code

Merge branch 'master' into master

Steffen Neumann authored on 23/04/2019 07:40:31 • GitHub committed on 23/04/2019 07:40:31
Showing3 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 Package: Rdisop
2 2
 Title: Decomposition of Isotopic Patterns
3
-Version: 1.43.4-1
4
-Date: 2019-04-18
3
+Version: 1.43.7
4
+Date: 2019-04-23
5 5
 Author: Anton Pervukhin <apervukh@minet.uni-jena.de>, Steffen Neumann <sneumann@ipb-halle.de> 
6 6
 Maintainer: Steffen Neumann <sneumann@ipb-halle.de>
7 7
 Description: Identification of metabolites using high precision mass
... ...
@@ -14,6 +14,7 @@ LinkingTo: Rcpp
14 14
 Suggests: RUnit
15 15
 SystemRequirements: None
16 16
 License: GPL-2
17
+StagedInstalll: no
17 18
 URL: https://github.com/sneumann/Rdisop
18 19
 BugReports: https://github.com/sneumann/Rdisop/issues/new
19 20
 biocViews: ImmunoOncology, MassSpectrometry, Metabolomics
... ...
@@ -1,7 +1,8 @@
1 1
 rm -f confdefs.h config.log config.status config.sub config.guess
2 2
 rm -f src/*.o src/*.so
3
+find src/ -name \*.o -exec rm {} \;
4
+find src/ -name *.o -exec rm {} \;
3 5
 rm -f src/libims.so*
4
-make -k -C ./src/imslib/ clean
5 6
 rm -f inst/doc/*.cpp inst/doc/*.hpp inst/doc/*.R 
6 7
 rm -f inst/doc/*.Rd inst/doc/*.aux inst/doc/*.log inst/doc/*.tex inst/doc/*.out
7 8
 rm -rf inst/doc/auto
... ...
@@ -9,7 +9,6 @@ DISOPOBJECTS=disop.o
9 9
 
10 10
 OBJECTS=$(DISOPOBJECTS) $(IMSOBJECTS) 
11 11
 
12
-#clean:
13
-#	$(MAKE) -C imslib clean
14
-#	rm -f $(OBJECTS) 
12
+clean:
13
+	rm -f $(OBJECTS) 
15 14