add inkpot to the builds, although not yet used by dot

diff --git a/configure.ac b/configure.ac
index a45c454fa2b05bf72c58466fa35e9d1debec797e..af9e59217363a5abd3d8ebbc8b67fb7dd7e86d8c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2865,6 +2865,8 @@ AC_CONFIG_FILES(Makefile
        lib/cgraph/Makefile
        lib/cgraph/libcgraph.pc
        lib/gd/Makefile
+       lib/inkpot/Makefile
+       lib/inkpot/libinkpot.pc
        lib/pathplan/Makefile
        lib/pathplan/libpathplan.pc
        lib/ast/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e91fe6eafd0d1e35860af01c675a8861c92c8600..fd61bd9d30f031a1f17f3866de6b8513dee5f686 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = cdt graph gd pathplan sfio vmalloc ast vpsc \
+SUBDIRS = cdt graph gd pathplan sfio vmalloc ast vpsc inkpot \
        circogen dotgen fdpgen neatogen twopigen sparse sfdpgen \
        patchwork common pack gvc ingraphs expr cgraph xdot topfish glcomp
 

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index 0057877b8425324c1e102e4b5bb38021ad238e2c..a2ebfb2b73b21bb01206f51415196a56b6259681 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -1,20 +1,36 @@
-CFLAGS = -Wall -g -O0
+# $Id$ $Revision$
+## Process this file with automake to produce Makefile.in
 
-try: try.o inkpot_scheme.o inkpot_xlate.o inkpot_value.o
+pdfdir = $(pkgdatadir)/doc/pdf
+pkgconfigdir = $(libdir)/pkgconfig
 
-inkpot_scheme.o: inkpot_scheme.c inkpot_scheme.h inkpot.h inkpot_define.h \
-       inkpot_value.c inkpot_xlate.c inkpot_scheme_table.h
+pkginclude_HEADERS = inkpot.h
+lib_LTLIBRARIES = libinkpot.la
+pkgconfig_DATA = libinkpot.pc
 
-inkpot_xlate.o: inkpot_xlate.c inkpot_xlate.h inkpot.h
+noinst_PROGRAMS = inkpot
+noinst_HEADERS = inkpot_scheme.h inkpot_xlate.h inkpot_value.h \
+       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
+noinst_LTLIBRARIES = libinkpot_C.la
 
-inkpot_value.o: inkpot_value.c inkpot_value.h inkpot.h inkpot_value_table.h
+man_MANS = inkpot.3
+pdf_DATA = inkpot.3.pdf
+
+inkpot_SOURCES = inkpot.c
+inkpot_LDADD = $(top_builddir)/lib/inkpot/libinkpot_C.la
+
+libinkpot_C_la_SOURCES = inkpot_scheme.c inkpot_value.c inkpot_xlate.c
+
+libinkpot_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libinkpot_la_SOURCES = $(libgvc_C_la_SOURCES)
 
 inkpot_value_table.h: inkpot_define.h
 
 inkpot_scheme_table.h: inkpot_define.h
 
 inkpot_define.h: scripts/lib-h.tcl       tk.lib svg.lib x11.lib 
-       scripts/lib-h.tcl
+       scripts/lib-h.tcl tk.lib svg.lib x11.lib
+       rm tk.lib svg.lib x11.lib
 
 x11.lib: scripts/rgb.txt-x11.lib.tcl     data/rgb.txt
        scripts/rgb.txt-x11.lib.tcl data/rgb.txt
@@ -25,5 +41,13 @@ svg.lib: scripts/types.html-svg.lib.tcl  data/types.html
 tk.lib: scripts/xcolors.c-tk.lib.tcl     data/xcolors.c
        scripts/xcolors.c-tk.lib.tcl data/xcolors.c
 
-clean:
-       rm -rf *.o try *.lib inkpot_value_table.h inkpot_scheme_table.h inkpot_define.h
+inkpot.3.pdf: $(srcdir)/inkpot.3
+       - @GROFF@ -Tps -man $(srcdir)/inkpot.3 | @PS2PDF@ - - > inkpot.3.pdf
+
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old inkpot_define.h \
+       inkpot_value_table.h inkpot_scheme_table.h \
+       tk.lib svg.lib x11.lib
+
+DISTCLEANFILES = $(pdf_DATA) \
+       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
+

diff --git a/lib/inkpot/Makefile.old b/lib/inkpot/Makefile.old
new file mode 100644 (file)
index 0000000..60e2363
--- /dev/null
+++ b/lib/inkpot/Makefile.old
@@ -0,0 +1,37 @@
+CFLAGS = -Wall -g -O0
+
+LIBINKPOT = inkpot_scheme.o inkpot_xlate.o inkpot_value.o 
+
+inkpot: inkpot.o $(LIBINKPOT)
+
+inkpot.o: inkpot.h
+
+libinkpot.so: inkpot_scheme.o inkpot_xlate.o inkpot_value.o
+
+inkpot_scheme.o: inkpot_scheme.c inkpot_scheme.h inkpot.h inkpot_define.h \
+       inkpot_value.h inkpot_xlate.h inkpot_scheme_table.h
+
+inkpot_xlate.o: inkpot_xlate.c inkpot_xlate.h inkpot.h
+
+inkpot_value.o: inkpot_value.c inkpot_value.h inkpot.h inkpot_value_table.h
+
+inkpot_value_table.h: inkpot_define.h
+
+inkpot_scheme_table.h: inkpot_define.h
+
+inkpot_define.h: scripts/lib-h.tcl       tk.lib svg.lib x11.lib 
+       scripts/lib-h.tcl tk.lib svg.lib x11.lib
+       rm tk.lib svg.lib x11.lib
+
+x11.lib: scripts/rgb.txt-x11.lib.tcl     data/rgb.txt
+       scripts/rgb.txt-x11.lib.tcl data/rgb.txt
+
+svg.lib: scripts/types.html-svg.lib.tcl  data/types.html
+       scripts/types.html-svg.lib.tcl data/types.html
+
+tk.lib: scripts/xcolors.c-tk.lib.tcl     data/xcolors.c
+       scripts/xcolors.c-tk.lib.tcl data/xcolors.c
+
+clean:
+       rm -rf *.o inkpot tk.lib svg.lib x11.lib \
+               inkpot_value_table.h inkpot_scheme_table.h inkpot_define.h