Fix old makefiles and windows build files to handle new plugin directory

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index 25ac863f9f283511c04a61ebe953c2c015d220aa..e42572cf7d42a2c001ba6d10aed377d0db8795ad 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=$(LOC_LIB)/plugin
+LOC_PLUG=$(ROOT)/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,11 +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_core \
-       -lgvplugin_pango \
-       -lgvplugin_gd
+PLUGS = -L$(LOC_PLUG)/core -lgvplugin_core \
+        -L$(LOC_PLUG)/dot_layout -lgvplugin_dot_layout \
+        -L$(LOC_PLUG)/neato_layout -lgvplugin_neato_layout \
+        -L$(LOC_PLUG)/gd -lgvplugin_gd \
+        -L$(LOC_PLUG)/pango -lgvplugin_pango
 
 LIBS = -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
@@ -40,15 +40,18 @@ LIBS = -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
        $(XLIBS)
 
 DOTLIBS = $(LOC_LIB)/common/libcommon.a \
-         $(LOC_LIB)/dotgen/libdotgen.a \
+          $(LOC_LIB)/dotgen/libdotgen.a \
           $(LOC_LIB)/neatogen/libneatogen.a \
-         $(LOC_LIB)/fdpgen/libfdpgen.a \
-          $(LOC_LIB)/plugin/libgvplugin_dot_layout.a \
-          $(LOC_LIB)/plugin/libgvplugin_neato_layout.a \
-          $(LOC_LIB)/plugin/libgvplugin_gd.a \
-         $(LOC_LIB)/gvc/libgvc_dot_builtins.a \
+          $(LOC_LIB)/fdpgen/libfdpgen.a \
+          $(LOC_LIB)/gvc/libgvc_dot_builtins.a \
+          $(LOC_LIB)/vpsc/libvpsc.a \
           $(LOC_LIB)/twopigen/libtwopigen.a \
-         $(LOC_LIB)/circogen/libcircogen.a
+          $(LOC_LIB)/circogen/libcircogen.a \
+          $(LOC_PLUG)/core/libgvplugin_core.a \
+          $(LOC_PLUG)/dot_layout/libgvplugin_dot_layout.a \
+          $(LOC_PLUG)/neato_layout/libgvplugin_neato_layout.a \
+          $(LOC_PLUG)/gd/libgvplugin_gd.a \
+          $(LOC_PLUG)/pango/libgvplugin_pango.a
 
 OBJS = dot.o
 

diff --git a/cmd/tools/Makefile.old b/cmd/tools/Makefile.old
index ebd7bf434ab16866bc92ee5f1e40b416df04454c..03a6a426fe65e4290eaa49e4d4b7d7d9c31a3437 100644 (file)
--- a/cmd/tools/Makefile.old
+++ b/cmd/tools/Makefile.old
@@ -32,6 +32,7 @@ DNLIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
         -L$(LOC_LIB)/common -lcommon \
         -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
         -L$(LOC_LIB)/neatogen -lneatogen \
+        -L$(LOC_LIB)/vpsc -lvpsc \
         -L$(LOC_LIB)/dotgen -ldotgen \
         -L$(LOC_LIB)/circogen -lcircogen \
         -L$(LOC_LIB)/fdpgen -lfdpgen \
@@ -61,7 +62,7 @@ MANS = acyclic.1 gvcolor.1 nop.1 tred.1 ccomps.1 gc.1 sccmap.1 \
        unflatten.1 gxl2dot.1 dot2gxl.1 gvpack.1 bcomps.1
 
 gvpack : $(GVPOBJS)
-       $(CSLD) $(LDFLAGS) $(GVPOBJS) $(INGLIB) $(DNLIBS) -o $@
+       $(CPP) $(LDFLAGS) $(GVPOBJS) $(INGLIB) $(DNLIBS) -o $@
 
 gvpack.o : gvpack.c
        $(CC) -c $(CCFLAGS) $(DEFINES) $(DNINCS) $(INCS) gvpack.c

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

diff --git a/lib/common/Makefile.old b/lib/common/Makefile.old
index 96cacfefa352dcb8507c4dad0061a1786a012cf9..aaf65206e48f06ab8cfcc3b3f599a0bb11633f13 100644 (file)
--- a/lib/common/Makefile.old
+++ b/lib/common/Makefile.old
@@ -23,14 +23,15 @@ NOINST_HDRS = render.h utils.h memory.h \
        geomprocs.h colorprocs.h const.h macros.h pointset.h
 NOINST_GENERATED_HDRS = colortbl.h ps.h htmltable.h  htmlparse.h htmllex.h 
 
-OBJS = args.o arrows.o mapgen.o psgen.o \
-       colxlate.o globals.o mifgen.o psusershape.o timing.o \
-       diagen.o hpglgen.o mpgen.o routespl.o utils.o geom.o \
-       emit.o htmllex.o ns.o shapes.o vrmlgen.o xdgen.o \
-       figgen.o htmlparse.o output.o splines.o vtxgen.o \
-       fontmetrics.o htmltable.o picgen.o strcasecmp.o \
-       gdgen.o input.o pointset.o strncasecmp.o memory.o \
-       labels.o postproc.o svggen.o
+GD_CODEGENS = 
+CODEGENS = $(GD_CODEGENS) diagen.o figgen.o hpglgen.o mapgen.o mifgen.o \
+           mpgen.o picgen.o vtxgen.o xdgen.o
+
+OBJS = arrows.o colxlate.o fontmetrics.o \
+       args.o memory.o globals.o htmllex.o htmlparse.o htmltable.o input.o \
+       pointset.o postproc.o routespl.o splines.o psusershape.o \
+       timing.o labels.o ns.o shapes.o utils.o geom.o \
+       output.o emit.o ps.txt color_names $(CODEGENS)
 
 libcommon.a : $(OBJS)
        $(RM) libcommon.a
@@ -61,8 +62,8 @@ emit.o mapgen.o utils.o htmllex.o htmltable.o htmlparse.o : htmltable.h
 htmllex.o : htmlparse.h
 htmlparse.o htmllex.o : htmllex.h
 
-#ps.h : ps.txt
-#      $(AWK) -f $(AWKDIR)/stringize.awk ps.txt > ps.h
+ps.h : ps.txt
+       $(AWK) -f $(AWKDIR)/stringize.awk ps.txt > ps.h
 
 colortbl.h : color_names brewer_colors
        $(AWK) -f $(AWKDIR)/brewer.awk brewer_colors > brewer_lib