From: Ciprian TEODOROV <ciprian@iArMor.local>
Date: Wed, 8 Jan 2014 08:03:44 +0000 (+0100)
Subject: added generation of sfdp linkable library
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~94^2~1^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15b87381985cb54e9d76da7c4e46acf6c8d33f5c;p=graphviz

added generation of sfdp linkable library
---

diff --git a/configure.ac b/configure.ac
index b944e4598..190f6e13e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3186,6 +3186,7 @@ AC_CONFIG_FILES(Makefile
 	lib/mingle/Makefile
 	lib/label/Makefile
 	lib/sfdpgen/Makefile
+	lib/sfdpgen/libsfdp.pc
 	lib/osage/Makefile
 	lib/gvpr/Makefile
 	lib/gvpr/libgvpr.pc
diff --git a/lib/sfdpgen/Makefile.am b/lib/sfdpgen/Makefile.am
index 5e3144070..df84bbb71 100644
--- a/lib/sfdpgen/Makefile.am
+++ b/lib/sfdpgen/Makefile.am
@@ -1,6 +1,8 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+SFDP_VERSION="1:0:0"
+
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
         -I$(top_srcdir)/lib/common \
@@ -12,13 +14,23 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/cgraph \
 	-I$(top_srcdir)/lib/cdt
+	
+pkgextraincludedir = $(pkgincludedir)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsfdp.pc
 
 noinst_HEADERS = sfdpinternal.h spring_electrical.h \
 	sparse_solve.h post_process.h \
 	stress_model.h uniform_stress.h \
 	QuadTree.h Multilevel.h sfdp.h PriorityQueue.h 
 
+pkginclude_HEADERS = sfdp.h spring_electrical.h \
+	stress_model.h uniform_stress.h \
+	$(top_srcdir)/lib/sparse/SparseMatrix.h $(top_srcdir)/lib/sparse/general.h
+	
+
 if WITH_SFDP
+lib_LTLIBRARIES = libsfdp.la
 noinst_LTLIBRARIES = libsfdpgen_C.la
 endif
 
@@ -26,5 +38,18 @@ libsfdpgen_C_la_SOURCES = sfdpinit.c spring_electrical.c \
 	sparse_solve.c post_process.c \
 	stress_model.c uniform_stress.c \
 	QuadTree.c Multilevel.c PriorityQueue.c
+	
+libsfdp_la_LDFLAGS = -version-info $(SFDP_VERSION) -no-undefined
+libsfdp_la_SOURCES = $(libsfdpgen_C_la_SOURCES)
+libsfdp_la_LIBADD = $(libsfdpgen_C_la_LIBADD) \
+	$(top_builddir)/lib/gvc/libgvc.la \
+	$(top_builddir)/lib/cgraph/libcgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la \
+	$(top_builddir)/lib/pathplan/libpathplan.la \
+	$(top_builddir)/lib/neatogen/libneatogen_C.la \
+	$(top_builddir)/lib/sparse/libsparse_C.la \
+	$(top_builddir)/lib/rbtree/librbtree_C.la \
+	$(GTS_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+
 
 EXTRA_DIST = Makefile.old sfdp.vcproj
diff --git a/lib/sfdpgen/libsfdp.pc.in b/lib/sfdpgen/libsfdp.pc.in
new file mode 100644
index 000000000..e297f88b5
--- /dev/null
+++ b/lib/sfdpgen/libsfdp.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/@PACKAGE@
+
+Name: libsfdp
+Description: SFDP layout algorithm
+Version: @VERSION@
+Libs: -L${libdir} -lsfdp
+Cflags: -I${includedir}