attempt to fixup Makefile.old

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index 6feca6087c966cc7304bab00fd57216ef92486f4..cabecd703181a56668ea5051b3c76670e233f989 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -39,11 +39,10 @@ DOTLIBS = ../../lib/common/libcommon.a ../../lib/dotgen/libdotgen.a \
           ../../lib/twopigen/libtwopigen.a ../../lib/circogen/libcircogen.a
 
 
-LIBDOTNEATO = libdotneato.a
 OBJS = dot.o
 SHLIBS = twopigen/libtwopi.a dotgen/libdot.a neatogen/libneato.a pack/libpack.a gvrender/libgvrender.a common/libcommon.a
 
-all : dot $(LIBDOTNEATO)
+all : dot
 
 dot : $(OBJS) $(DOTLIBS)
        $(CSLD) $(LDFLAGS) $(OBJS) $(LIBS) -o /tmp/dot
@@ -55,13 +54,6 @@ dot.o : dot.c
 plugins.o : plugins.c
        $(CC) -c $(CCFLAGS) $(DEFINES) $(ALLINCS) plugins.c
 
-dotneato.o : dotneato.c
-       $(CC) -I. -c $(CCFLAGS) $(DEFINES) $(ALLINCS) dotneato.c
-
-$(LIBDOTNEATO) : dotneato.o
-       $(AR) cr libdotneato.a dotneato.o
-       $(RANLIB) libdotneato.a
-       
 install: all
        $(MKPATH) $(BINDIR)
        $(INSTALL) dot $(BINDIR)
@@ -70,7 +62,6 @@ install: all
        $(RM) $(BINDIR)/circo; $(LN) -s $(BINDIR)/dot $(BINDIR)/circo
        $(RM) $(BINDIR)/twopi; $(LN) -s $(BINDIR)/dot $(BINDIR)/twopi
        $(MKPATH) $(INCDIR)
-       $(INSTALL) dotneato.h $(INCDIR)
        $(MKPATH) $(LIBDIR)
        $(INSTALL) $(LIBDOTNEATO) $(LIBDIR)/$(LIBDOTNEATO).$(VERSION)
        $(RM) -rf $(LIBDIR)/$(LIBDOTNEATO)

diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index a3a190a73d462b523309582ca7e967e3086d24be..f0c4c66ae7760d3885bc8aff58133353ba66bb0e 100644 (file)
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -13,12 +13,12 @@ INCS =  -I. \
 
 DEFINES = -DHAVE_CONFIG_H -DGVLIBDIR=\"$(LIBDIR)\"
 
-HDRS = gvc.h gvcint.h gvplugin_render.h gvplugin_device.h \
+HDRS = gvc.h gvcint.h gvcproc.h gvplugin_render.h gvplugin_device.h \
        gvplugin_layout.h gvplugin_textlayout.h \
        gvplugin_usershape.h gvplugin.h
 
 OBJS = gvrender.o gvlayout.o gvdevice.o gvcontext.o gvjobs.o \
-       gvplugin.o gvconfig.o gvevent.o gvtextlayout.o gvusershape.o
+       gvplugin.o gvconfig.o gvevent.o gvtextlayout.o gvusershape.o gvc.o
 
 libgvc.a : $(OBJS)
        $(RM) libgvc.a