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

diff --git a/lib/pathplan/Makefile.old b/lib/pathplan/Makefile.old
index a93c6249a71499e417352002ed2ca946d3935229..60c76d4b1526298d18a75e7524b88e1bc64f0f9a 100644 (file)
--- a/lib/pathplan/Makefile.old
+++ b/lib/pathplan/Makefile.old
@@ -1,7 +1,7 @@
 all:   libpathplan.a
-
-include ../Config.mk
-include ../makearch/$(ARCH)
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 INCS = -I. -I..
 

diff --git a/lib/sfio/Makefile.old b/lib/sfio/Makefile.old
index 1ca62f0e53eba18fa84838fb86d83d8679414072..5d02c57d0e40c323828ef44b74fe7a569c79b96d 100644 (file)
--- a/lib/sfio/Makefile.old
+++ b/lib/sfio/Makefile.old
@@ -10,9 +10,9 @@
 # Written by Kiem-Phong Vo
 
 all : install_ut
-
-include ../../Config.mk
-include ../../makearch/$(ARCH)
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 DEFINES=
 LIBTYPE=
@@ -129,14 +129,14 @@ $(OBJS) : ast_common.h
 
 # the make goals below are common to both uni&multi-threaded versions
 FEATURE/sfio: features/sfio
-       ../../iffe set cc $(CC) $(CCFLAGS) : run features/sfio
+       $(ROOT)/iffe set cc $(CC) $(CCFLAGS) : run features/sfio
 
-ast_common.h : ../../cdt/ast_common.h
+ast_common.h : ../cdt/ast_common.h
        rm -f ast_common.h
-       $(LN) ../../cdt/ast_common.h .
+       $(LN) ../cdt/ast_common.h .
 
-../../cdt/ast_common.h : ../../cdt/features/common
-       (cd ../../cdt; make ast_common.h)
+../cdt/ast_common.h : ../cdt/features/common
+       (cd ../cdt; make ast_common.h)
 
 #ast_common.h: features/common
 #      ../iffe - set cc $(CC) $(CCFLAGS) : run features/common > ast_common.h

diff --git a/lib/twopigen/Makefile.old b/lib/twopigen/Makefile.old
index 3cad082aa6f7731be46a1759f4926eb98b1f8f07..cf595ca1880d54622c49d47f47f870f4140be3aa 100644 (file)
--- a/lib/twopigen/Makefile.old
+++ b/lib/twopigen/Makefile.old
@@ -1,17 +1,17 @@
 all:   libtwopi.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../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