[SCM] Debian packaging for nauty branch, feature/shlib, updated. upstream/2.4.b7-8-g938aacf

David Bremner bremner at unb.ca
Tue Feb 23 11:58:15 UTC 2010


The following commit has been merged in the feature/shlib branch:
commit 938aacf541ea6813445ae70010876418fb18000f
Author: David Bremner <bremner at unb.ca>
Date:   Sat Feb 13 14:57:47 2010 -0400

    put back local version of libnauty.so link; conditionalize shared build

diff --git a/makefile.in b/makefile.in
index ac87707..40d2c80 100644
--- a/makefile.in
+++ b/makefile.in
@@ -31,13 +31,16 @@ SHLIBOBJ=${SHNAUTYLIBOBJ} ${SHGTLIBOBJ}
 
 STLIB=libnauty.a
 
+ifeq ($(SHARED),yes)
 SONAME?=libnauty.so.0
 SOMINOR?=.0.0
 SHLIB?=$(SONAME)$(SOMINOR)
 SHLINK?=libnauty.so
-BUILDSHLIBS=$(SONAME) $(SHLIB)
-BUILDSHLIBS=
+BUILDSHLIBS=$(SONAME) $(SHLIB) $(SHLINK)
 LDFLAGS:=-L. -lnauty  $(LDFLAGS)
+else
+BUILDSHLIBS=
+endif
 
 DESTDIR=
 GTOOLSBIN=copyg listg labelg dretog amtog geng complg shortg showg NRswitchg \
@@ -69,6 +72,9 @@ $(SHLIB): $(SHLIBOBJ)
 $(SONAME): $(SHLIB)
 	rm -f $@ && ln -s $(SHLIB) $@
 
+$(SHLINK): $(SONAME)
+	rm -f $@ && ln -s $(SONAME) $@
+
 install-shlibs: $(SHLIB)
 	 mkdir -p $(DESTDIR)/usr/lib
 	 install -t $(DESTDIR)/usr/lib $(SHLIB)

-- 
Debian packaging for nauty



More information about the debian-science-commits mailing list