[med-svn] [Git][med-team/mothur][master] 2 commits: Revert Fix linking

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / mothur


Commits:
11403798 by Hamid Nassiby at 2021-11-08T18:18:08+03:30
Revert Fix linking

- - - - -
4195a552 by Hamid Nassiby at 2021-11-08T18:37:29+03:30
Fix linking

- - - - -


3 changed files:

- Makefile
- debian/patches/c++14.patch
- debian/patches/series


Changes:

=====================================
Makefile
=====================================
@@ -118,8 +118,8 @@ endif
 #
     OBJECTS=$(patsubst %.cpp,%.o,$(wildcard $(addsuffix *.cpp,$(subdirs))))
     OBJECTS+=$(patsubst %.c,%.o,$(wildcard $(addsuffix *.c,$(subdirs))))
-    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
-    OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
+    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard source/*.cpp))
+    OBJECTS+=$(patsubst %.c,%.o,$(wildcard source/*.c))
 
 mothur : $(OBJECTS) uchime
 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)


=====================================
debian/patches/c++14.patch
=====================================
@@ -12,14 +12,10 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984243#33
  LDFLAGS = -g
  
  #
-@@ -6,8 +6,8 @@ LDFLAGS = -g
- #
-     OBJECTS=$(patsubst %.cpp,%.o,$(wildcard $(addsuffix *.cpp,$(subdirs))))
-     OBJECTS+=$(patsubst %.c,%.o,$(wildcard $(addsuffix *.c,$(subdirs))))
--    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
--    OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
-+    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard source/*.cpp))
-+    OBJECTS+=$(patsubst %.c,%.o,$(wildcard source/*.c))
+@@ -26,4 +26,4 @@ install : uchime
  
- uchime : $(OBJECTS)
- 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
+ clean :
+ 	@rm -f $(OBJECTS)
+-	
+\ No newline at end of file
++	


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 drop_sys_sysctl.h.patch
 gcc-11.patch
 c++14.patch
+fix_linking.patch



View it on GitLab: https://salsa.debian.org/med-team/mothur/-/compare/ff8928540e0d720b8a08ee4227c1bbadc2c1e733...4195a5525d5e9f787b301fda48cc7a5b06c969bd

-- 
View it on GitLab: https://salsa.debian.org/med-team/mothur/-/compare/ff8928540e0d720b8a08ee4227c1bbadc2c1e733...4195a5525d5e9f787b301fda48cc7a5b06c969bd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211108/ee45b8d9/attachment-0001.htm>