From 8acc04cfd9667966ebaa88618fb93a4e4bd2d0d6 Mon Sep 17 00:00:00 2001 From: ellson Date: Sat, 26 Aug 2006 13:55:28 +0000 Subject: [PATCH] libpack is now a part of of libgvc and not installed separately --- cmd/dot/Makefile.am | 2 -- configure.ac | 1 - dot.demo/Makefile | 4 ---- lib/gvc/Makefile.am | 8 +++++--- lib/pack/Makefile.am | 8 -------- lib/pack/libpack.pc.in | 10 ---------- plugin/neato_layout/Makefile.am | 3 +-- tclpkg/tcldot/Makefile.am | 3 --- 8 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 lib/pack/libpack.pc.in diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index 309c4eed3..9a06b2553 100644 --- 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 dc20d80b5..5de7775bb 100644 --- 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 94f0a7139..dd967ff60 100644 --- 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 fac53f5d0..9287e353b 100644 --- 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 327013651..7130a25ba 100644 --- 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 index ab17456df..000000000 --- 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 f0a1aa12b..e66ce70a8 100644 --- 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 c0a8322da..2e5f2f556 100644 --- 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 -- 2.40.0