Modify old makefiles to create library names consistent with new makefiles

diff --git a/lib/circogen/Makefile.old b/lib/circogen/Makefile.old
index 60a77b30e9239852bec1ebd26b410deb43aecede..a857516b032cf02f540f0615fc832f09a82d1451 100644 (file)
--- a/lib/circogen/Makefile.old
+++ b/lib/circogen/Makefile.old
@@ -1,4 +1,4 @@
-all:   libcirco.a
+all:   libcircogen.a
 ROOT=../..
 include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
@@ -22,10 +22,10 @@ OBJS = circularinit.o nodelist.o block.o edgelist.o stack.o circular.o \
 HFILES = circular.h nodelist.h edgelist.h deglist.h stack.h \
          block.h
 
-libcirco.a : $(OBJS)
-       $(RM) libcirco.a
-       $(AR) cr libcirco.a $(OBJS)
-       $(RANLIB) libcirco.a
+libcircogen.a : $(OBJS)
+       $(RM) libcircogen.a
+       $(AR) cr libcircogen.a $(OBJS)
+       $(RANLIB) libcircogen.a
 
 BASEH = circular.h nodelist.h block.h stack.h
 
@@ -41,11 +41,11 @@ nodelist.o : $(BASEH)
 nodeset.o : nodeset.h
 stack.o : $(BASEH)
 
-install: libcirco.a
+install: libcircogen.a
        $(MKPATH) $(INCDIR)
        $(INSTALL) circo.h $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libcirco.a $(LIBDIR)
+       $(INSTALL) libcircogen.a $(LIBDIR)
 
 clean:
        $(RM) *.o core

diff --git a/lib/dotgen/Makefile.old b/lib/dotgen/Makefile.old
index bfd4dfd9088adf135f4902e9b7ee0fadc8fd8ab3..50bc00a66194ae3bbca86ca1dcf7f56b14ce3311 100644 (file)
--- a/lib/dotgen/Makefile.old
+++ b/lib/dotgen/Makefile.old
@@ -1,4 +1,4 @@
-all:   libdot.a
+all:   libdotgen.a
 ROOT=../..
 include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
@@ -19,18 +19,18 @@ OBJS = acyclic.o compound.o flat.o sameport.o class1.o conc.o \
 
 HFILES = dot.h dotprocs.h
 
-libdot.a : $(OBJS)
-       $(RM) libdot.a
-       $(AR) cr libdot.a $(OBJS)
-       $(RANLIB) libdot.a
+libdotgen.a : $(OBJS)
+       $(RM) libdotgen.a
+       $(AR) cr libdotgen.a $(OBJS)
+       $(RANLIB) libdotgen.a
 
 $(OBJS) : $(HFILES)
 
-install: libdot.a
+install: libdotgen.a
        $(MKPATH) $(INCDIR)
        $(INSTALL) $(HFILES) $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libdot.a $(LIBDIR)
+       $(INSTALL) libdotgen.a $(LIBDIR)
 
 clean:
        $(RM) *.o core

diff --git a/lib/fdpgen/Makefile.old b/lib/fdpgen/Makefile.old
index 2d8e7dec745155d217a0e4a3e70aef3bc6aef953..03a82af9204362f65e0a8be8d7b7eb03f8e4755c 100644 (file)
--- a/lib/fdpgen/Makefile.old
+++ b/lib/fdpgen/Makefile.old
@@ -1,4 +1,4 @@
-all:   libfdp.a
+all:   libfdpgen.a
 ROOT=../..
 include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
@@ -20,16 +20,18 @@ OBJS = layout.o fdpinit.o comp.o tlayout.o xlayout.o dbg.o grid.o \
 
 HFILES = fdp.h 
 
-libfdp.a : $(OBJS)
-       $(RM) libfdp.a
-       $(AR) cr libfdp.a $(OBJS)
-       $(RANLIB) libfdp.a
+libfdpgen.a : $(OBJS)
+       $(RM) libfdpgen.a
+       $(AR) cr libfdpgen.a $(OBJS)
+       $(RANLIB) libfdpgen.a
 
 $(OBJS) : $(HFILES)
 
-install: libfdp.a
+install: libfdpgen.a
+       $(MKPATH) $(INCDIR)
+       $(INSTALL) $(HFILES) $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libfdp.a $(LIBDIR)
+       $(INSTALL) libfdpgen.a $(LIBDIR)
 
 clean:
        $(RM) *.o core *.a

diff --git a/lib/neatogen/Makefile.old b/lib/neatogen/Makefile.old
index 9e736dc3382df457d9f22551660475fc0295c186..409a09590bd4f48b3b6213694abaf10872d7398d 100644 (file)
--- a/lib/neatogen/Makefile.old
+++ b/lib/neatogen/Makefile.old
@@ -1,4 +1,4 @@
-all:   libneato.a
+all:   libneatogen.a
 ROOT=../..
 include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
@@ -24,10 +24,10 @@ OBJS = adjust.o circuit.o edges.o find_ints.o geometry.o heap.o hedges.o \
        printvis.o site.o solve.o neatosplines.o stuff.o voronoi.o \
        $(NOBJS) constraint.o
 
-libneato.a : $(OBJS)
-       $(RM) libneato.a
-       $(AR) cr libneato.a $(OBJS)
-       $(RANLIB) libneato.a
+libneatogen.a : $(OBJS)
+       $(RM) libneatogen.a
+       $(AR) cr libneatogen.a $(OBJS)
+       $(RANLIB) libneatogen.a
 
 $(NOBJS) : defs.h
 bfs.o dijkstra.o embed_graph.o kkutils.o stress.o : bfs.h
@@ -40,11 +40,11 @@ stress.o pca.o conjgrad.o matrix_ops.o : matrix_ops.h
 stress.o pca.o : pca.h
 stress.o : stress.h
 
-install: libneato.a 
+install: libneatogen.a 
        $(MKPATH) $(INCDIR)
        $(INSTALL) neato.h adjust.h neatoprocs.h $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libneato.a $(LIBDIR)
+       $(INSTALL) libneatogen.a $(LIBDIR)
 
 $(OBJS) : $(HDRS)
 

diff --git a/lib/twopigen/Makefile.old b/lib/twopigen/Makefile.old
index cf595ca1880d54622c49d47f47f870f4140be3aa..c60382df8c860e55c05d496238eddc468d5b7af1 100644 (file)
--- a/lib/twopigen/Makefile.old
+++ b/lib/twopigen/Makefile.old
@@ -1,4 +1,4 @@
-all:   libtwopi.a
+all:   libtwopigen.a
 ROOT=../..
 include $(ROOT)/Config.mk
 include $(ROOT)/makearch/$(ARCH)
@@ -19,18 +19,18 @@ OBJS = twopiinit.o circle.o
 
 HFILES = circle.h 
 
-libtwopi.a : $(OBJS)
-       $(RM) libtwopi.a
-       $(AR) cr libtwopi.a $(OBJS)
-       $(RANLIB) libtwopi.a
+libtwopigen.a : $(OBJS)
+       $(RM) libtwopigen.a
+       $(AR) cr libtwopigen.a $(OBJS)
+       $(RANLIB) libtwopigen.a
 
 $(OBJS) : $(HFILES)
 
-install: libtwopi.a
+install: libtwopigen.a
        $(MKPATH) $(INCDIR)
        $(INSTALL) circle.h $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libtwopi.a $(LIBDIR)
+       $(INSTALL) libtwopigen.a $(LIBDIR)
 
 clean:
        $(RM) *.o core