added generation of sfdp linkable library

diff --git a/configure.ac b/configure.ac
index b944e4598674a24d1c69f7d80ef023cdb794f76b..190f6e13e6c4e4322627c7ef6f650347e47c9744 100644 (file)
--- 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 5e3144070490650167921f0b28cbf416e96e8883..df84bbb71068a750b03bead53b942cbba70cb8d0 100644 (file)
--- 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 (file)
index 0000000..e297f88
--- /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}