put rbtree sources in their own directory, build as a convenience library

diff --git a/configure.ac b/configure.ac
index af9e59217363a5abd3d8ebbc8b67fb7dd7e86d8c..20ee1677cba11e1951d0f556f789969ee7cc38c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2865,6 +2865,7 @@ AC_CONFIG_FILES(Makefile
        lib/cgraph/Makefile
        lib/cgraph/libcgraph.pc
        lib/gd/Makefile
+       lib/rbtree/Makefile
        lib/inkpot/Makefile
        lib/inkpot/libinkpot.pc
        lib/pathplan/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fd61bd9d30f031a1f17f3866de6b8513dee5f686..42d03fac161bd1d62c2a6ff37b387e3c2122880a 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 inkpot \
+SUBDIRS = cdt graph gd pathplan sfio vmalloc ast vpsc rbtree 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 7e3bd4c6ff6aba32cdfc73335cb11c7bf312f9da..4b2438565d6ff46a857920d45179d8e475d8a740 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -19,10 +19,12 @@ pdf_DATA = inkpot.3.pdf inkpot.1.pdf
 inkpot_SOURCES = inkpot.c
 inkpot_LDADD = $(builddir)/libinkpot.la
 
-libinkpot_la_SOURCES = inkpot_scheme.c inkpot_value.c inkpot_xlate.c
-libinkpot_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
+libinkpot_C_la_SOURCES = inkpot_scheme.c inkpot_value.c inkpot_xlate.c
+libinkpot_C_la_LIBADD = $(top_builddir)/lib/rbtree/librbtree_C.la
 
-libinkpot_C_la_SOURCES = $(libgvc_la_SOURCES)
+libinkpot_la_SOURCES = $(libinkpot_C_la_SOURCES)
+libinkpot_la_LIBADD = $(libinkpot_C_la_LIBADD)
+libinkpot_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 
 inkpot_value_table.h: $(builddir)/inkpot_define.h