adjust Makefiles for new plugin tree

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 4089c8f13aa653cfc72f58bdc036f0f79a6645b3..da41b96af767645ab79106574c46aa4bd5d053b1 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -55,11 +55,11 @@ dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c
 dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
 if WITH_MYLIBGD
 dot_static_LDADD = \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_core_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_gd_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_pango_C.a \
+       $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
+       $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
+       $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
+       $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
+       $(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 \
@@ -69,11 +69,11 @@ dot_static_LDADD = \
                @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@
 else
 dot_static_LDADD = \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_core_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_gd_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_pango_C.a \
+       $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
+       $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
+       $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
+       $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
+       $(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 \

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index f3ff23465b43c00b8be58b58e47068488d7e97c3..25ac863f9f283511c04a61ebe953c2c015d220aa 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -20,7 +20,11 @@ XLIBS = -L$(LOC_LIB)/pathplan -lpathplan \
         -L$(LOC_LIB)/gd -lgd \
         $(EXTLIB_LIB) $(EXPAT_LIB) $(LTDL_LIB) -lm
 
-PLUGS = -L$(LOC_PLUG) -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_gd
+PLUGS = -L$(LOC_PLUG) -lgvplugin_dot_layout \
+       -lgvplugin_neato_layout \
+       -lgvplugin_core \
+       -lgvplugin_pango \
+       -lgvplugin_gd
 
 LIBS = -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \

diff --git a/configure.ac b/configure.ac
index f514ec8c87edd3f4351cb6cac317ebd2fba3b2a3..54e76a995b302c9e63095b432c0f5b7e74951f5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1843,7 +1843,12 @@ AC_CONFIG_FILES(Makefile
        lib/gvc/Makefile
        lib/gvc/libgvc.pc
        lib/gvc/libgvc_builtins.pc
-       lib/plugin/Makefile
+       plugin/Makefile
+       plugin/core/Makefile
+       plugin/gd/Makefile
+       plugin/pango/Makefile
+       plugin/dot_layout/Makefile
+       plugin/neato_layout/Makefile
        cmd/Makefile
        cmd/dot/Makefile
        cmd/tools/Makefile

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9ca8e9481e663af5748f53d41563cb02a48cf6c0..113386206266b2b29ad511827dfbe8a98f20dace 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -22,7 +22,6 @@ SUBDIRS(
        pack 
        ingraphs 
 #expr 
-       plugin
 ) 
 
 #original Makefile.am contents follow:

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a0043fa8fef6e956dd31106e4fb0b90becfd6188..322668c2522b572d20e84b79d8c75d2e8afd0e73 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,6 +3,6 @@
 
 SUBDIRS = cdt graph agraph gd pathplan agutil sfio vmalloc ast vpsc \
        circogen dotgen fdpgen neatogen twopigen common gvc pack \
-       ingraphs expr plugin 
+       ingraphs expr
 
 EXTRA_DIST = Makefile.old

diff --git a/lib/Makefile.old b/lib/Makefile.old
index be6fb5f4fef966b5eb0d52bd6107c8fa263f4914..7e80a11c9e87be19d21e189646f7b81644e10ca9 100644 (file)
--- a/lib/Makefile.old
+++ b/lib/Makefile.old
@@ -1,5 +1,5 @@
 SUBDIRS = cdt graph agraph gd pathplan agutil sfio vmalloc ast circogen \
-    dotgen fdpgen neatogen pack twopigen common gvc ingraphs expr plugin
+    dotgen fdpgen neatogen pack twopigen common gvc ingraphs expr
 
 all install clean :
        (for i in ${SUBDIRS}; do (cd $$i; make $@); done)       

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index cb204139f3d69fe324544d90c357019e0c83c4c3..c74c3af77da95ffaaffda379c3a102cd10284299 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -56,11 +56,11 @@ libtcldot_builtin_la_LDFLAGS = -no-undefined
 libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_dot_layout_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_neato_layout_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_core_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_gd_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_pango_C.la \
+       $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout_C.la \
+       $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
+       $(top_builddir)/plugin/core/libgvplugin_core_C.la \
+       $(top_builddir)/plugin/gd/libgvplugin_gd_C.la \
+       $(top_builddir)/plugin/pango/libgvplugin_pango_C.la \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \