move redblack trees into libutil so they can be shared

darcs-hash:20070906015428-c8de0-47309e79f9b9610b7bd7b3c1098879d49fcc8eef.gz

diff --git a/cdirect/Makefile.am b/cdirect/Makefile.am
index 4db8fdd9f7aafaf2a16ad66748d16f775f41f2e9..233c8badb6f73894438b18b8a26efb2c38e36d3e 100644 (file)
--- a/cdirect/Makefile.am
+++ b/cdirect/Makefile.am
@@ -1,10 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/api
 
 noinst_LTLIBRARIES = libcdirect.la
-libcdirect_la_SOURCES = cdirect.c hybrid.c cdirect.h redblack.c redblack.h
-
-noinst_PROGRAMS = redblack_test
-redblack_test_SOURCES = redblack_test.c
-redblack_test_LDADD = libcdirect.la
+libcdirect_la_SOURCES = cdirect.c hybrid.c cdirect.h
 
 EXTRA_DIST = 

diff --git a/util/Makefile.am b/util/Makefile.am
index b487355cf8df09e63f9db522b9253f1c2629d003..fe6e1591579755a39fe03e55eb01f3297b63a50e 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,2 +1,6 @@
 noinst_LTLIBRARIES = libutil.la
-libutil_la_SOURCES = mt19937ar.c sobolseq.c soboldata.h timer.c stop.c nlopt-util.h
+libutil_la_SOURCES = mt19937ar.c sobolseq.c soboldata.h timer.c stop.c nlopt-util.h redblack.c redblack.h
+
+noinst_PROGRAMS = redblack_test
+redblack_test_SOURCES = redblack_test.c
+redblack_test_LDADD = libutil.la

diff --git a/cdirect/redblack.c b/util/redblack.c
similarity index 100%
rename from cdirect/redblack.c
rename to util/redblack.c

diff --git a/cdirect/redblack.h b/util/redblack.h
similarity index 100%
rename from cdirect/redblack.h
rename to util/redblack.h

diff --git a/cdirect/redblack_test.c b/util/redblack_test.c
similarity index 100%
rename from cdirect/redblack_test.c
rename to util/redblack_test.c