From: erg <devnull@localhost>
Date: Thu, 13 Jan 2005 23:43:56 +0000 (+0000)
Subject: Update Makefile.old files to reflect new files and directory structure
X-Git-Tag: LAST_LIBGRAPH~32^2~8092
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d5821f075f356297226c39d22eb09bd671184a5;p=graphviz

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

diff --git a/lib/fdpgen/Makefile.old b/lib/fdpgen/Makefile.old
index 440918550..2d8e7dec7 100644
--- a/lib/fdpgen/Makefile.old
+++ b/lib/fdpgen/Makefile.old
@@ -1,21 +1,21 @@
 all:	libfdp.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 = -DDEBUG -DHAVE_CONFIG_H
 
-OBJS = layout.o fdpinit.o comp.o tlayout.o xlayout.o dbg.o options.o grid.o \
+OBJS = layout.o fdpinit.o comp.o tlayout.o xlayout.o dbg.o grid.o \
        clusteredges.o
 
 HFILES = fdp.h 
diff --git a/lib/gd/Makefile.old b/lib/gd/Makefile.old
index 59427b402..1e8f3e126 100644
--- a/lib/gd/Makefile.old
+++ b/lib/gd/Makefile.old
@@ -1,9 +1,9 @@
 all:	libgd.a
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
-include ../Config.mk
-include ../makearch/$(ARCH)
-
-INCS =	-I. -I.. $(EXTLIB_INC) -I$(X11INC)
+INCS =	-I. -I$(ROOT) $(EXTLIB_INC) -I$(X11INC)
 
 DEFINES = -DHAVE_CONFIG_H
 
diff --git a/lib/graph/Makefile.old b/lib/graph/Makefile.old
index e434124ca..d70e67243 100644
--- a/lib/graph/Makefile.old
+++ b/lib/graph/Makefile.old
@@ -1,7 +1,9 @@
 all:	libgraph.a
 
-include ../Config.mk
-include ../makearch/$(ARCH)
+ROOT=../..
+
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 INCS =	-I. -I../cdt
 
diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index 93f97523a..382675f20 100644
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -1,32 +1,34 @@
-all:	libgvrender.a
-
-include ../../Config.mk
-include ../../makearch/$(ARCH)
+all:	libgvc.a
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 INCS =  -I. \
-        -I../.. \
-        -I../../cdt \
-        -I../../pathplan \
-	-I../../graph \
+        -I$(ROOT) \
+        -I../cdt \
+        -I../pathplan \
+	-I../graph \
 	-I../common \
 	$(EXTLIB_INC)
 
 DEFINES = -DHAVE_CONFIG_H
 
-HDRS = gvrender.h gvrenderint.h
+HDRS = gvc.h gvcint.h gvplugin_render.h \
+	gvplugin_layout.h gvplugin.h
 
-OBJS = gvrender.o gvcontext.o gvjobs.o gvlang.o gvconfig.o
+OBJS = gvrender.o gvlayout.o gvcontext.o gvjobs.o \
+	gvemit.o gvplugin.o gvconfig.o
 
-libgvrender.a : $(OBJS)
-	$(RM) libgvrender.a
-	$(AR) cr libgvrender.a $(OBJS)
-	$(RANLIB) libgvrender.a
+libgvc.a : $(OBJS)
+	$(RM) libgvc.a
+	$(AR) cr libgvc.a $(OBJS)
+	$(RANLIB) libgvc.a
 
-install: libgvrender.a 
+install: libgvc.a 
 	$(MKPATH) $(INCDIR)
-	$(INSTALL) gvrender.h gvrenderint.h $(INCDIR)
+	$(INSTALL) gvc.h gvc.h $(INCDIR)
 	$(MKPATH) $(LIBDIR)
-	$(INSTALL) libgvrender.a $(LIBDIR)
+	$(INSTALL) libgvc.a $(LIBDIR)
 
 $(OBJS) : $(HDRS)
 
diff --git a/lib/ingraphs/Makefile.old b/lib/ingraphs/Makefile.old
index d40fdad8f..eb52af899 100644
--- a/lib/ingraphs/Makefile.old
+++ b/lib/ingraphs/Makefile.old
@@ -1,16 +1,16 @@
 ALL = libingraphs.a
 
 all : $(ALL)
-
-include ../../Config.mk
-include ../../makearch/$(ARCH)
+ROOT=../..
+include $(ROOT)/Config.mk
+include $(ROOT)/makearch/$(ARCH)
 
 LOC_INCDIR=../include
 LOC_LIBDIR=../lib
 
 DEFINES = -DHAVE_CONFIG_H
 
-INCS =  -I. -I../.. -I../../agraph -I../../graph -I../../cdt
+INCS =  -I. -I$(ROOT) -I../agraph -I../graph -I../cdt
 
 libingraphs.a : ingraphs.o
 	$(AR) cr $@ ingraphs.o
@@ -23,7 +23,7 @@ install : $(ALL)
 	$(MKPATH) $(INCDIR)
 	cp ingraphs.h $(INCDIR)
 	$(MKPATH) $(LIBDIR)
-	cp $(ALL_LIB) $(LIBDIR)
+	cp $(ALL) $(LIBDIR)
 
 clean :
 	$(RM) *.o 
diff --git a/lib/neatogen/Makefile.old b/lib/neatogen/Makefile.old
index 687c50067..9e736dc33 100644
--- a/lib/neatogen/Makefile.old
+++ b/lib/neatogen/Makefile.old
@@ -1,16 +1,16 @@
 all:	libneato.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../pack \
-        -I../gvrender \
-        -I../../cdt \
-        -I../../pathplan \
-		-I../../gd \
-		-I../../graph
+        -I../gvc \
+        -I../cdt \
+        -I../pathplan \
+		-I../gd \
+		-I../graph
 
 DEFINES = -DHAVE_CONFIG_H