Update Makefile.old files to reflect new files and directory structure

diff --git a/lib/cdt/Makefile.old b/lib/cdt/Makefile.old
index 910801cadf0e4db3c652b4265f31c047b54f484a..4430b7ce65c270190d42292e2225da86f212f5a4 100644 (file)
--- a/lib/cdt/Makefile.old
+++ b/lib/cdt/Makefile.old
@@ -2,8 +2,10 @@
 #      Written by Kiem-Phong Vo (03/18/1998)
 #   Modified for graphviz by erg (5 Oct 2000)
 
-include ../Config.mk
-include ../makearch/$(ARCH)
+ROOT=../..
+
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 CXFLAGS=
 CCMODE= -O
@@ -36,7 +38,7 @@ hsearch.o : Cdt_p/hsearch.c
        $(CC) -c $(DEFINES) Cdt_p/hsearch.c
 
 ast_common.h : features/common
-       ../iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run features/common > ast_common.h
+       $(ROOT)/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run features/common > ast_common.h
 
 $(OBJS) : ast_common.h
 

diff --git a/lib/circogen/Makefile.old b/lib/circogen/Makefile.old
index 764b9d54bf14afc7b82114c4e862b9d5fbca254b..60a77b30e9239852bec1ebd26b410deb43aecede 100644 (file)
--- a/lib/circogen/Makefile.old
+++ b/lib/circogen/Makefile.old
@@ -1,18 +1,18 @@
 all:   libcirco.a
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
-include ../../Config.mk
-include ../../makearch/$(ARCH)
-
-INCS = -I. -I../.. \
+INCS = -I. -I$(ROOT) \
        -I../common \
        -I../neatogen \
        -I../dotgen \
        -I../pack \
-       -I../gvrender \
-       -I../../pathplan \
-       -I../../graph \
-       -I../../cdt \
-       -I../../gd
+       -I../gvc \
+       -I../pathplan \
+       -I../graph \
+       -I../cdt \
+       -I../gd
 
 DEFINES = -DHAVE_CONFIG_H
 

diff --git a/lib/common/Makefile.old b/lib/common/Makefile.old
index a75b2286596e8f29a379b2d2a60b367f33e4376d..1eeaaf2f4dad65c50e742bcba7185f19cb0b7554 100644 (file)
--- a/lib/common/Makefile.old
+++ b/lib/common/Makefile.old
@@ -1,30 +1,33 @@
 all:   libcommon.a
-
-include ../../Config.mk
-include ../../makearch/$(ARCH)
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 INCS =  -I. \
-        -I../.. \
-        -I../../cdt \
-        -I../../pathplan \
-       -I../../gd \
-       -I../../graph \
-       -I../gvrender \
+        -I$(ROOT) \
+        -I../cdt \
+        -I../pathplan \
+       -I../gd \
+       -I../graph \
+       -I../gvc \
        $(EXTLIB_INC)
 
 DEFINES = -DHAVE_CONFIG_H
 
-AWKDIR = ../awk
+AWKDIR = $(ROOT)/awk
 
 HDRS = colortbl.h const.h globals.h macros.h ps.h render.h \
        renderprocs.h types.h utils.h
 
-OBJS = arrows.o colxlate.o emit.o diagen.o figgen.o fontmetrics.o \
-    gdgen.o globals.o hpglgen.o htmlparse.o htmllex.o htmltable.o \
-    labels.o ns.o strcasecmp.o strncasecmp.o \
-    mapgen.o input.o mifgen.o mpgen.o output.o pointset.o postproc.o \
-    picgen.o psgen.o shapes.o routespl.o splines.o svggen.o \
-    timing.o utils.o vrmlgen.o vtxgen.o
+OBJS = arrows.o gdusershape.o mapgen.o psgen.o svgusershape.o \
+       colxlate.o globals.o mifgen.o psusershape.o timing.o \
+       diagen.o hpglgen.o mpgen.o routespl.o utils.o \
+       emit.o htmllex.o ns.o shapes.o vrmlgen.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 \
+       gdtextsize.o labels.o postproc.o svggen.o
+
 
 libcommon.a : $(OBJS)
        $(RM) libcommon.a

diff --git a/lib/dotgen/Makefile.old b/lib/dotgen/Makefile.old
index 94d49249aa40fc18778c22b0e18a2d26e68ced47..bfd4dfd9088adf135f4902e9b7ee0fadc8fd8ab3 100644 (file)
--- a/lib/dotgen/Makefile.old
+++ b/lib/dotgen/Makefile.old
@@ -1,15 +1,15 @@
 all:   libdot.a
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
-include ../../Config.mk
-include ../../makearch/$(ARCH)
-
-INCS = -I. -I../.. \
+INCS = -I. -I$(ROOT) \
        -I../common \
-       -I../gvrender \
-       -I../../pathplan \
-       -I../../graph \
-       -I../../cdt \
-       -I../../gd
+       -I../gvc \
+       -I../pathplan \
+       -I../graph \
+       -I../cdt \
+       -I../gd
 
 DEFINES = -DHAVE_CONFIG_H