Update old makefile

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index 0d61d1405bc5613900ab12cd02441b3e548b7f0e..533b0cddc4b627c894d99d1ad2687215582383ae 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -7,12 +7,12 @@ LOC_LIB = $(ROOT)/lib
 LOC_PLUG=$(ROOT)/plugin
 
 INCS =  -I$(LOC_LIB)/gvc -I$(LOC_LIB)/common -I$(ROOT) -I$(LOC_LIB)/cdt \
-        -I$(LOC_LIB)/pathplan -I$(LOC_LIB)/gd -I$(LOC_LIB)/graph
+        -I$(LOC_LIB)/pathplan -I$(LOC_LIB)/gd -I$(LOC_LIB)/graph -I$(LOC_LIB)/pack
 
 ALLINCS = -I$(LOC_LIB)/dotgen -I$(LOC_LIB)/neatogen -I$(LOC_LIB)/twopigen \
           -I$(LOC_LIB)/circogen -I$(LOC_LIB)/fdpgen -I$(LOC_LIB)/sfdpgen $(INCS)
 
-DEFINES = -DDEMAND_LOADING=0 -DHAVE_CONFIG_H -DBUILTINS
+DEFINES = -DDEMAND_LOADING=0 -DHAVE_CONFIG_H
 
 XLIBS = -L$(LOC_LIB)/pathplan -lpathplan \
         -L$(LOC_LIB)/graph -lgraph \
@@ -29,6 +29,7 @@ PLUGS = -L$(LOC_PLUG)/core -lgvplugin_core \
 LIBS = -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
        -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
+       -L$(LOC_LIB)/xdot -lxdot \
        -L$(LOC_LIB)/dotgen -ldotgen \
        -L$(LOC_LIB)/circogen -lcircogen \
        -L$(LOC_LIB)/fdpgen -lfdpgen \
@@ -65,12 +66,6 @@ OBJS = dot.o dot_builtins.o
 
 all : dot
 
-renew :
-       (D=`date`; echo "#define BUILDDATE \"$$D\"" > ../../builddate.h)
-       $(CPP) -c $(CCFLAGS) $(DEFINES) $(INCS) dot.c
-       $(CPP) $(LDFLAGS) $(OBJS) $(LIBS) -o /tmp/dot
-       mv /tmp/dot dot
-
 dot : $(OBJS) $(DOTLIBS)
        $(CPP) $(LDFLAGS) $(OBJS) $(LIBS) -o /tmp/dot
        mv /tmp/dot dot

diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index 6ea64e97510b5f9b1c3f75c94efb45d60cc57b50..8eb6bf50dec98ec9ab28972eb49cffabab76ce59 100644 (file)
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -7,6 +7,7 @@ INCS =  -I. \
         -I$(ROOT) \
         -I../cdt \
         -I../pathplan \
+        -I../xdot \
        -I../graph \
        -I../common \
        $(EXTLIB_INC)
@@ -40,6 +41,16 @@ install: libgvc.a libgvc_dot_builtins.a
 
 $(OBJS) $(EXTRA_OBJS): $(INST_HDRS) $(NOINST_HDRS)
 
+gvcontext.o : $(ROOT)/config.h $(ROOT)/builddate.h
+
+$(ROOT)/config.h $(ROOT)/builddate.h : renew
+
+renew :
+       (D=`date`; echo "#define BUILDDATE \"$$D\"" > $(ROOT)/builddate.h)
+       (VM=`awk '/m4_define\(graphviz_version_major/ {print $$2}' $(ROOT)/configure.ac`; VM=$${VM%\)}; \
+        Vm=`awk '/m4_define\(graphviz_version_minor/ {print $$2}' $(ROOT)/configure.ac`; Vm=$${Vm%\)}; \
+    sed "s/define VERSION.*/define VERSION \"$$VM.$$Vm.0\"/" $(ROOT)/config.h > out; mv out $(ROOT)/config.h)
+
 clean:
        $(RM) core *.o