fix cmd/tools for new plugin tree

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index fc85a1e916e2dd19019b217aa344258e46ac9166..27fc15bb5c71d96cb43e44ef20d38840562ca062 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -101,7 +101,7 @@ gvpack_SOURCES = gvpack.c gvpack_builtins.c
 gvpack_LDADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la
+       $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
 
 dijkstra_SOURCES = dijkstra.c
 

diff --git a/cmd/tools/Makefile.old b/cmd/tools/Makefile.old
index aabac880c31f6a4275da8af795e47d9187cd88a8..ebd7bf434ab16866bc92ee5f1e40b416df04454c 100644 (file)
--- a/cmd/tools/Makefile.old
+++ b/cmd/tools/Makefile.old
@@ -8,7 +8,7 @@ include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
 
 LOC_LIB=$(ROOT)/lib
-LOC_PLUG=$(LOC_LIB)/plugin
+LOC_PLUG=$(ROOT)/plugin
 LOC_INCDIR=$(LOC_LIB)/include
 LOC_LIBDIR=$(LOC_LIB)/lib
 
@@ -22,7 +22,11 @@ DNINCS = -I$(LOC_LIB)/pack -I$(LOC_LIB)/neatogen  \
          -I$(LOC_LIB)/common -I$(LOC_LIB)
 
 LIBS =  -L$(LOC_LIB)/graph -lgraph -L$(LOC_LIB)/cdt -lcdt
-PLUGS = -L$(LOC_PLUG) -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_usershape_gd
+PLUGS = -L$(LOC_PLUG)/neato_layout -lgvplugin_neato_layout \
+       -L$(LOC_PLUG)/dot_layout -lgvplugin_dot_layout \
+       -L$(LOC_PLUG)/core -lgvplugin_core \
+       -L$(LOC_PLUG)/gd -lgvplugin_gd \
+       -L$(LOC_PLUG)/pango -lgvplugin_pango
 
 DNLIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
         -L$(LOC_LIB)/common -lcommon \