From 27f11379b2bd60b121fbbf8c9bc282d381f5ae00 Mon Sep 17 00:00:00 2001 From: ellson Date: Sun, 5 Oct 2008 03:22:07 +0000 Subject: [PATCH] put rbtree sources in their own directory, build as a convenience library --- configure.ac | 1 + lib/Makefile.am | 2 +- lib/inkpot/Makefile.am | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index af9e59217..20ee1677c 100644 --- 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 fd61bd9d3..42d03fac1 100644 --- 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 7e3bd4c6f..4b2438565 100644 --- 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 -- 2.40.0