Update old makefiles for tools and dot

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index c3ce267eb91a0e9862ae1b477732591a91ab0864..8e3b3028dddaf05ad2726b5968f49cf6bb8a7df4 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -4,7 +4,7 @@ include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
 
 LOC_LIB = $(ROOT)/lib
-LOC_PLUG=$(ROOT)/plugin
+LOC_PLUG=$(LOC_LIB)/plugin
 
 INCS =  -I$(LOC_LIB)/gvc -I$(LOC_LIB)/common -I$(ROOT) -I$(LOC_LIB)/cdt \
         -I$(LOC_LIB)/pathplan -I$(LOC_LIB)/gd -I$(LOC_LIB)/graph
@@ -20,7 +20,7 @@ XLIBS = -L$(LOC_LIB)/pathplan -lpathplan \
         -L$(LOC_LIB)/gd -lgd \
         $(EXTLIB_LIB) $(EXPAT_LIB) -lm
 
-PLUGS = -L$(LOC_PLUG) -lplugins -L$(LOC_PLUG)/layout -lgvplugin_layout
+PLUGS = -L$(LOC_PLUG) -lgvplugin_layout
 
 LIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
@@ -34,13 +34,12 @@ LIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
        $(XLIBS)
 
-DOTLIBS = ../../lib/common/libcommon.a ../../lib/dotgen/libdotgen.a \
-          ../../lib/neatogen/libneatogen.a ../../lib/fdpgen/libfdpgen.a \
-          ../../lib/twopigen/libtwopigen.a ../../lib/circogen/libcircogen.a
-
+DOTLIBS = $(LOC_LIB)/common/libcommon.a $(LOC_LIB)/dotgen/libdotgen.a \
+          $(LOC_LIB)/neatogen/libneatogen.a $(LOC_LIB)/fdpgen/libfdpgen.a \
+          $(LOC_LIB)/plugin/libgvplugin_layout.a $(LOC_LIB)/gvc/libgvc.a \
+          $(LOC_LIB)/twopigen/libtwopigen.a $(LOC_LIB)/circogen/libcircogen.a
 
 OBJS = dot.o
-SHLIBS = twopigen/libtwopi.a dotgen/libdot.a neatogen/libneato.a pack/libpack.a gvrender/libgvrender.a common/libcommon.a
 
 all : dot
 
@@ -51,9 +50,6 @@ dot : $(OBJS) $(DOTLIBS)
 dot.o : dot.c
        $(CC) -c $(CCFLAGS) $(DEFINES) $(INCS) dot.c
 
-plugins.o : plugins.c
-       $(CC) -c $(CCFLAGS) $(DEFINES) $(ALLINCS) plugins.c
-
 install: all
        $(MKPATH) $(BINDIR)
        $(INSTALL) dot $(BINDIR)
@@ -63,6 +59,7 @@ install: all
        $(RM) $(BINDIR)/twopi; $(LN) -s $(BINDIR)/dot $(BINDIR)/twopi
        $(MKPATH) $(MANDIR)
        $(INSTALL) dot.1 $(MANDIR)
+       $(RM) $(MANDIR)/neato.1 $(MANDIR)/fdp.1 $(MANDIR)/circo.1 $(MANDIR)/twopi.1
        $(LN) -s $(MANDIR)/dot.1 $(MANDIR)/neato.1
        $(LN) -s $(MANDIR)/dot.1 $(MANDIR)/fdp.1
        $(LN) -s $(MANDIR)/dot.1 $(MANDIR)/circo.1

diff --git a/cmd/tools/Makefile.old b/cmd/tools/Makefile.old
index a19a51cbd74e5fac331e32e4250c0ec5d2e18497..9f9fd1dab6781b95627d3f452bbf9c6328510199 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=$(ROOT)/plugin
+LOC_PLUG=$(LOC_LIB)/plugin
 LOC_INCDIR=$(LOC_LIB)/include
 LOC_LIBDIR=$(LOC_LIB)/lib
 
@@ -22,7 +22,7 @@ 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) -lplugins -L$(LOC_PLUG)/layout -lgvplugin_layout
+PLUGS = -L$(LOC_PLUG) -lgvplugin_layout
 
 DNLIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
         -L$(LOC_LIB)/common -lcommon \