[med-svn] [Git][med-team/pll-modules][master] Modify examples makefiles to use built library and headers

Shayan Doust gitlab at salsa.debian.org
Sat Jun 6 23:02:26 BST 2020



Shayan Doust pushed to branch master at Debian Med / pll-modules


Commits:
d012f3d9 by Shayan Doust at 2020-06-06T23:01:58+01:00
Modify examples makefiles to use built library and headers

- - - - -


2 changed files:

- + debian/patches/modify_examples_makefiles.patch
- debian/patches/series


Changes:

=====================================
debian/patches/modify_examples_makefiles.patch
=====================================
@@ -0,0 +1,40 @@
+--- pll-modules.orig/examples/consensus/Makefile
++++ pll-modules/examples/consensus/Makefile
+@@ -30,6 +30,7 @@
+ WARN=-Wall -Wsign-compare $(ADD_WARN)
+ 
+ CFLAGS = -g -O3 -Wall -Wsign-compare $(PROFILING) $(WARN)
++CFLAGS += -I/usr/include/libpll -I$(CURDIR)/../../debian/tmp/usr/include/libpll -L/usr/lib -L$(CURDIR)/../../debian/tmp/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/
+ LDFLAGS = -lpll_tree -lpll -lm
+ 
+ PROG = consensus
+--- pll-modules.orig/examples/rf-distance/Makefile
++++ pll-modules/examples/rf-distance/Makefile
+@@ -30,6 +30,7 @@
+ WARN=-Wall -Wsign-compare $(ADD_WARN)
+ 
+ CFLAGS = -g -O3 -Wall -Wsign-compare $(PROFILING) $(WARN)
++CFLAGS += -I/usr/include/libpll -I$(CURDIR)/../../debian/tmp/usr/include/libpll -L/usr/lib -L$(CURDIR)/../../debian/tmp/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/
+ LDFLAGS = -lpll_tree -lpll -lm
+ 
+ OBJS = rf-distance.o
+--- pll-modules.orig/examples/spr-round/Makefile
++++ pll-modules/examples/spr-round/Makefile
+@@ -32,6 +32,7 @@
+ WARN=-Wall -Wsign-compare $(ADD_WARN)
+ 
+ CFLAGS = -g -O3 -Wall -Wsign-compare $(PROFILING) $(WARN)
++CFLAGS += -I/usr/include/libpll -I$(CURDIR)/../../debian/tmp/usr/include/libpll -L/usr/lib -L$(CURDIR)/../../debian/tmp/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/
+ LDFLAGS = -lpll_algorithm -lpll_optimize -lpll_tree -lpll_util -lpll -lm
+ 
+ # temp workaround
+--- pll-modules.orig/examples/weight-consensus/Makefile
++++ pll-modules/examples/weight-consensus/Makefile
+@@ -30,6 +30,7 @@
+ WARN=-Wall -Wsign-compare $(ADD_WARN)
+ 
+ CFLAGS = -g -O3 -Wall -Wsign-compare $(PROFILING) $(WARN)
++CFLAGS += -I/usr/include/libpll -I$(CURDIR)/../../debian/tmp/usr/include/libpll -L/usr/lib -L$(CURDIR)/../../debian/tmp/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/
+ LDFLAGS = -lpll_tree -lpll -lm
+ 
+ PROG = weight-consensus


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+modify_examples_makefiles.patch
 2to3.patch
 modify_test_makefile.patch



View it on GitLab: https://salsa.debian.org/med-team/pll-modules/-/commit/d012f3d9906605e8f49adba687725d0c9d09391c

-- 
View it on GitLab: https://salsa.debian.org/med-team/pll-modules/-/commit/d012f3d9906605e8f49adba687725d0c9d09391c
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/20200606/379e25bb/attachment-0001.html>


More information about the debian-med-commit mailing list