Update old makefiles to handle current linking order

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index 8641a99a152799c8d5ab74cf212c0afb6dce1be4..d6c2f0fa4c8cb5a4bd3c9d79c52053d843e5646c 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -20,7 +20,7 @@ XLIBS = -L$(LOC_LIB)/pathplan -lpathplan \
         -L$(LOC_LIB)/gd -lgd \
         $(EXTLIB_LIB) $(EXPAT_LIB) -lm
 
-PLUGS = -L$(LOC_PLUG) -lplugins -L$(LOC_PLUG)/cairo -lgvplugin_cairo -L$(LOC_PLUG)/layout -lgvplugin_layout -L$(LOC_PLUG)/gd -lgvplugin_gd  -L$(LOC_PLUG)/text -lgvplugin_text
+PLUGS = -L$(LOC_PLUG) -lplugins -L$(LOC_PLUG)/layout -lgvplugin_layout
 
 LIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
@@ -46,7 +46,8 @@ SHLIBS = twopigen/libtwopi.a dotgen/libdot.a neatogen/libneato.a pack/libpack.a
 all : dot $(LIBDOTNEATO)
 
 dot : $(OBJS) $(DOTLIBS)
-       $(CSLD) $(LDFLAGS) $(OBJS) $(LIBS) -o dot
+       $(CSLD) $(LDFLAGS) $(OBJS) $(LIBS) -o /tmp/dot
+       mv /tmp/dot dot
 
 dot.o : dot.c
        $(CC) -c $(CCFLAGS) $(DEFINES) $(INCS) dot.c

diff --git a/cmd/tools/Makefile.old b/cmd/tools/Makefile.old
index 4f7ebf753f193484994f1ce7b7edc31d50edae3c..a19a51cbd74e5fac331e32e4250c0ec5d2e18497 100644 (file)
--- a/cmd/tools/Makefile.old
+++ b/cmd/tools/Makefile.old
@@ -22,16 +22,20 @@ DNINCS = -I$(LOC_LIB)/pack -I$(LOC_LIB)/neatogen  \
          -I$(LOC_LIB)/common -I$(LOC_LIB)
 
 LIBS =  -L$(LOC_LIB)/graph -lgraph -L$(LOC_LIB)/cdt -lcdt
-PLUGLIBS = -L$(LOC_PLUG)/cairo -lgvplugin_cairo \
-           -L$(LOC_PLUG)/layout -lgvplugin_layout \
-          -L$(LOC_PLUG)/gd -lgvplugin_gd -L$(LOC_PLUG)/text -lgvplugin_text
-DNLIBS = -L$(LOC_LIB)/neatogen -lneatogen \
-         -L$(LOC_LIB)/pack -lpack \
-         -L$(LOC_LIB)/common -lcommon \
-         -L$(LOC_LIB)/gvc -lgvc \
-         -L$(LOC_LIB)/pathplan -lpathplan \
-         -L$(LOC_LIB)/gd -lgd \
-         $(PLUGLIBS) \
+PLUGS = -L$(LOC_PLUG) -lplugins -L$(LOC_PLUG)/layout -lgvplugin_layout
+
+DNLIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
+        -L$(LOC_LIB)/common -lcommon \
+        -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
+        -L$(LOC_LIB)/neatogen -lneatogen \
+        -L$(LOC_LIB)/dotgen -ldotgen \
+        -L$(LOC_LIB)/circogen -lcircogen \
+        -L$(LOC_LIB)/fdpgen -lfdpgen \
+        -L$(LOC_LIB)/twopigen -ltwopigen \
+        -L$(LOC_LIB)/pack -lpack \
+        -L$(LOC_LIB)/common -lcommon \
+        -L$(LOC_LIB)/pathplan -lpathplan \
+        -L$(LOC_LIB)/gd -lgd \
          $(LIBS) \
          $(EXTLIB_LIB) $(EXPAT_LIB) -lm
 INGLIB = -L$(LOC_LIB)/ingraphs -lingraphs