libpack is now a part of of libgvc and not installed separately

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 309c4eed3b6e7aec8224f463e88b30db7d79ccc4..9a06b255385b2233957067c6845346898dae9d17 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -66,7 +66,6 @@ dot_static_LDADD = \
        $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/pack/libpack_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(top_builddir)/lib/gd/libgvgd_C.la \
@@ -80,7 +79,6 @@ dot_static_LDADD = \
        $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/pack/libpack_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
                @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@

diff --git a/configure.ac b/configure.ac
index dc20d80b5dc4960b25e48eecb0c73e31704bffd6..5de7775bb48072c5d5c8337cad21b8d207b9e536 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1881,7 +1881,6 @@ AC_CONFIG_FILES(Makefile
        lib/circogen/Makefile
        lib/twopigen/Makefile
        lib/pack/Makefile
-       lib/pack/libpack.pc
        lib/expr/Makefile
        lib/common/Makefile
        lib/ingraphs/Makefile

diff --git a/dot.demo/Makefile b/dot.demo/Makefile
index 94f0a71391b18860aefb6e1ff1ae339b386dbfc0..dd967ff60c71a8aefa9fcdca6a4ec9d64ffad1bb 100644 (file)
--- a/dot.demo/Makefile
+++ b/dot.demo/Makefile
@@ -1,16 +1,12 @@
 CFLAGS=`pkg-config libgvc --cflags` -Wall -g -O2
 LDFLAGS=-Wl,--rpath -Wl,`pkg-config libgvc --variable=libdir` `pkg-config libgvc --libs`
 
-# -lpack is needed only by neatopack
-LDFLAGS += -lpack
-
 all: dot demo simple example neatopack
 
 dot: dot.o
 demo: demo.o
 simple: simple.o
 example: example.o
-
 neatopack: neatopack.o
 
 clean:

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index fac53f5d0292d7c1ef60f1b004c675c7050be601..9287e353b65391279f867b7ecd6fa8d766c9b5df 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -23,9 +23,11 @@ noinst_LTLIBRARIES = libgvc_C.la
 pkglib_LTLIBRARIES = libgvc.la libgvc_builtins.la
 pkgconfig_DATA = libgvc.pc libgvc_builtins.pc
 
-libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c gvcontext.c gvjobs.c \
-       gvevent.c gvplugin.c gvconfig.c gvtextlayout.c gvusershape.c gvc.c
-libgvc_C_la_LIBADD = $(top_builddir)/lib/common/libcommon_C.la
+libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c \
+       gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c \
+       gvtextlayout.c gvusershape.c gvc.c
+libgvc_C_la_LIBADD = $(top_builddir)/lib/common/libcommon_C.la \
+       $(top_builddir)/lib/pack/libpack_C.la
 
 #For use with plugins.
 #   so it is linked with an empty table of builtins.

diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 327013651a656971faff01ef48892112d38dd98b..7130a25ba321f2bc9a597c1e6927df232ca057a3 100644 (file)
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -14,19 +14,11 @@ AM_CPPFLAGS = -I$(top_srcdir) \
 
 pkginclude_HEADERS = pack.h
 noinst_LTLIBRARIES = libpack_C.la
-pkglib_LTLIBRARIES = libpack.la
-pkgconfig_DATA = libpack.pc
 man_MANS = pack.3
 pdf_DATA = pack.pdf
 
 libpack_C_la_SOURCES = ccomps.c pack.c
 
-libpack_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-libpack_la_SOURCES = $(libpack_C_la_SOURCES)
-libpack_la_LIBADD = \
-       $(top_builddir)/lib/graph/libgraph.la \
-       $(top_builddir)/lib/gvc/libgvc.la
-
 .3.pdf:
        groff -Tps -man $< | ps2pdf - - >$@
 

diff --git a/lib/pack/libpack.pc.in b/lib/pack/libpack.pc.in
deleted file mode 100644 (file)
index ab17456..0000000
--- a/lib/pack/libpack.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
-includedir=@includedir@/@PACKAGE@
-                                                                                       
-Name: libpack
-Description: Support for connect graph components.
-Version: @VERSION@
-Libs: -L${libdir} -lpack -lgraph -lcdt
-Cflags: -I${includedir}

diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index f0a1aa12b434b460ee349ef141895b5e11e06c24..e66ce70a856d6e75fbdc0359bcc8af316c734893 100644 (file)
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -27,7 +27,6 @@ libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefine
 libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
 libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
        $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/lib/pathplan/libpathplan.la \
-       $(top_builddir)/lib/pack/libpack.la @IPSEPCOLA_LIBS@
+       $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@
 
 EXTRA_DIST = Makefile.old

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index c0a8322da8d20f69107708dbf58cdb9ee78110bb..2e5f2f556141bffb42641ecdb4416a0fa2f82bc8 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -86,7 +86,6 @@ libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/pack/libpack_C.la \
        $(top_builddir)/lib/gd/libgvgd_C.la \
        @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
 else
@@ -102,7 +101,6 @@ libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/pack/libpack_C.la \
        @PANGOCAIRO_LIBS@ @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
 endif
 else
@@ -117,7 +115,6 @@ libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/pack/libpack_C.la \
        @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
 endif