From 6477e3e53f457e622617c36b5485ff8e21cbbb7a Mon Sep 17 00:00:00 2001 From: stevenj Date: Wed, 5 Sep 2007 21:54:28 -0400 Subject: [PATCH] move redblack trees into libutil so they can be shared darcs-hash:20070906015428-c8de0-47309e79f9b9610b7bd7b3c1098879d49fcc8eef.gz --- cdirect/Makefile.am | 6 +----- util/Makefile.am | 6 +++++- {cdirect => util}/redblack.c | 0 {cdirect => util}/redblack.h | 0 {cdirect => util}/redblack_test.c | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename {cdirect => util}/redblack.c (100%) rename {cdirect => util}/redblack.h (100%) rename {cdirect => util}/redblack_test.c (100%) diff --git a/cdirect/Makefile.am b/cdirect/Makefile.am index 4db8fdd..233c8ba 100644 --- 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 b487355..fe6e159 100644 --- 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 -- 2.30.2