[symmetrica] 01/01: Always build with -fPIC, use LDFLAGS to makefile.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository symmetrica.

commit b2bd075cd5e9bda22aa1a76fcd4f46ff063ea14d
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Wed Jan 22 22:42:39 2014 +0100

    Always build with -fPIC, use LDFLAGS to makefile.
---
 debian/patches/shared-library.patch | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/patches/shared-library.patch b/debian/patches/shared-library.patch
index 0dcb306..e771e19 100644
--- a/debian/patches/shared-library.patch
+++ b/debian/patches/shared-library.patch
@@ -2,7 +2,7 @@ Description: Create a makefile that can build a shared library.
 Author: Tim Abbott <tabbott at mit.edu>
 --- a/makefile
 +++ b/makefile
-@@ -1,4 +1,39 @@
+@@ -1,4 +1,34 @@
 +OBJS=bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes.o the.o thm.o thp.o ths [...]
 +LIBS=-lm
 +CC=gcc
@@ -18,7 +18,7 @@ Author: Tim Abbott <tabbott at mit.edu>
 -	cc -c -O2 -DFAST -DALLTRUE $<
 -test: test.c bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes.o the.o thm.o t [...]
 -	gcc -DALLTRUE -DFAST test.c bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes [...]
-+	$(CC) -c $(CFLAGS) $(FPICFLAG) -DFAST -DALLTRUE $<
++	$(CC) -c $(CFLAGS) -fPIC -DFAST -DALLTRUE $<
 +
 +test: test.c $(OBJS)
 +	$(CC) -DALLTRUE -DFAST test.c $(OBJS) $(LIBS) -o test
@@ -27,13 +27,8 @@ Author: Tim Abbott <tabbott at mit.edu>
 +	ar crs $@ $(OBJS)
 +	ranlib $@
 +
-+shlib: $(OBJS)
-+shlib: FPICFLAG=-fPIC
-+
-+libsymmetrica.so:
-+	-rm -f $(OBJS)
-+	make shlib
-+	$(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(DIRNAME).so $(LIBS) -o lib$(DIRNAME).so $(OBJS)
++libsymmetrica.so: $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(DIRNAME).so $(LIBS) -o lib$(DIRNAME).so $(OBJS)
 +	ln -s lib$(DIRNAME).so $@
 +
 +install: all

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/symmetrica.git