Update old makefiles

diff --git a/lib/cgraph/Makefile.old b/lib/cgraph/Makefile.old
index 4b3b95c18370d18e353df181af61e227242cfe3c..33d783776b2d105042a52967b87653d272122306 100644 (file)
--- a/lib/cgraph/Makefile.old
+++ b/lib/cgraph/Makefile.old
@@ -4,7 +4,7 @@ all:    $(LIBNAME)
 
 ROOT=../..
 
-include $(ROOT)/Config.mk.old
+include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
 
 INCS = -I. -I../cdt -I$(ROOT)

diff --git a/lib/circogen/Makefile.old b/lib/circogen/Makefile.old
index c25e1fb213d9a104356d19ab28dcabbe977ba96e..a25d98e392715b1ad695d7521846433e8b7705d6 100644 (file)
--- a/lib/circogen/Makefile.old
+++ b/lib/circogen/Makefile.old
@@ -6,6 +6,7 @@ include $(ROOT)/makearch/$(ARCH)
 INCS = -I. -I$(ROOT) \
        -I../common \
        -I../neatogen \
+       -I../sparse \
        -I../dotgen \
        -I../pack \
        -I../gvc \

diff --git a/lib/dotgen/Makefile.old b/lib/dotgen/Makefile.old
index ac9c302a3b81f2e706b0be7a1d507128b71791c5..8b1a2da10ebbe93b24238cca63105b51e52aa436 100644 (file)
--- a/lib/dotgen/Makefile.old
+++ b/lib/dotgen/Makefile.old
@@ -6,6 +6,7 @@ include $(ROOT)/makearch/$(ARCH)
 INCS = -I. -I$(ROOT) \
        -I../common \
        -I../gvc \
+       -I../ortho \
        -I../pathplan \
        -I../graph \
        -I../cdt \

diff --git a/lib/fdpgen/Makefile.old b/lib/fdpgen/Makefile.old
index 12ba2dcacc5b424369c96ca89cf870cc33c6cd7f..1a9b7d8473405e6ea64326306c381d61dd2c15c1 100644 (file)
--- a/lib/fdpgen/Makefile.old
+++ b/lib/fdpgen/Makefile.old
@@ -8,6 +8,7 @@ INCS =  -I. -I$(ROOT) \
     -I../neatogen \
     -I../pack \
     -I../gvc \
+    -I../sparse \
     -I../pathplan \
     -I../graph \
     -I../cdt \

diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index 39b8dd3b99d329ff4ff7a2f770c222de71e989b2..6ea64e97510b5f9b1c3f75c94efb45d60cc57b50 100644 (file)
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -22,16 +22,14 @@ NOINST_HDRS = gvcproc.h
 OBJS = gvrender.o gvlayout.o gvdevice.o gvcontext.o gvjobs.o gvloadimage.o \
        gvplugin.o gvconfig.o gvevent.o gvtextlayout.o gvusershape.o gvc.o
 
-EXTRA_OBJS = no_builtins.o dot_builtins.o
-
-libgvc_dot_builtins.a : $(OBJS) dot_builtins.o
+libgvc_dot_builtins.a : $(OBJS)
        $(RM) libgvc_dot_builtins.a
-       $(AR) cr libgvc_dot_builtins.a $(OBJS) dot_builtins.o
+       $(AR) cr libgvc_dot_builtins.a $(OBJS)
        $(RANLIB) libgvc_dot_builtins.a
 
-libgvc.a : $(OBJS) no_builtins.o
+libgvc.a : $(OBJS)
        $(RM) libgvc.a
-       $(AR) cr libgvc.a $(OBJS) no_builtins.o
+       $(AR) cr libgvc.a $(OBJS)
        $(RANLIB) libgvc.a
 
 install: libgvc.a libgvc_dot_builtins.a

diff --git a/lib/neatogen/Makefile.old b/lib/neatogen/Makefile.old
index 8a2b8bf9b54d81537d68717ee716af993ab7dda3..7d7b4ff4851b8ae1779356d353a7008efb3c123e 100644 (file)
--- a/lib/neatogen/Makefile.old
+++ b/lib/neatogen/Makefile.old
@@ -9,7 +9,10 @@ INCS =  -I. -I$(ROOT) \
         -I../vpsc \
         -I../gvc \
         -I../cdt \
+        -I../ortho \
+        -I../rbtree \
         -I../sfdpgen \
+        -I../sparse \
         -I../pathplan \
                -I../gd \
                -I../graph
@@ -17,17 +20,17 @@ INCS =  -I. -I$(ROOT) \
 DEFINES = -DHAVE_CONFIG_H
 
 HDRS = adjust.h edges.h geometry.h heap.h hedges.h info.h mem.h \
-       neato.h neatoprocs.h poly.h simple.h site.h voronoi.h \
+       neato.h neatoprocs.h poly.h site.h voronoi.h \
        quad_prog_vpsc.h mosek_quad_solve.h
 
 NOBJS  = stress.o kkutils.o pca.o matrix_ops.o embed_graph.o dijkstra.o \
        conjgrad.o closest.o bfs.o compute_hierarchy.o opt_arrangement.o \
        smart_ini_x.o constrained_majorization.o quad_prog_solve.o
 POBJS = quad_prog_vpsc.o constrained_majorization_ipsep.o mosek_quad_solve.o
-OBJS = adjust.o circuit.o edges.o find_ints.o geometry.o heap.o hedges.o \
-       info.o neatoinit.o intersect.o legal.o lu.o matinv.o memory.o poly.o \
+OBJS = adjust.o circuit.o edges.o geometry.o heap.o hedges.o \
+       info.o neatoinit.o legal.o lu.o matinv.o memory.o poly.o \
        printvis.o site.o solve.o neatosplines.o stuff.o voronoi.o \
-       delaunay.o \
+       overlap.o delaunay.o call_tri.o \
        $(NOBJS) $(POBJS) constraint.o
 
 libneatogen.a : $(OBJS)

diff --git a/lib/patchwork/Makefile.old b/lib/patchwork/Makefile.old
index 16ae0b24c97c3a55f5df708c0b78ac5a437c7df6..358291e8a0f82adc788cdb6566c3191dccd86611 100644 (file)
--- a/lib/patchwork/Makefile.old
+++ b/lib/patchwork/Makefile.old
@@ -6,6 +6,7 @@ include $(ROOT)/makearch/$(ARCH)
 INCS = -I. -I$(ROOT) \
        -I../common \
        -I../neatogen \
+       -I../sparse \
        -I../pack \
        -I../gvc \
        -I../fdpgen \

diff --git a/lib/twopigen/Makefile.old b/lib/twopigen/Makefile.old
index 26d332bcce974ddc4e6b9774e4cfacb438c67380..6c722718df69b7824dbc721f5cebd30b5155742f 100644 (file)
--- a/lib/twopigen/Makefile.old
+++ b/lib/twopigen/Makefile.old
@@ -6,6 +6,7 @@ include $(ROOT)/makearch/$(ARCH)
 INCS = -I. -I$(ROOT) \
        -I../common \
        -I../neatogen \
+       -I../sparse \
        -I../pack \
        -I../gvc \
        -I../pathplan \