summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-08-10 11:55:27 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-08-13 14:37:19 -0400
commitbf98ddf34edf25064e96594d782e8418fcd80f77 (patch)
tree9b7a41c8e72df0dcc825e6866841c9b4535f1ba3
parent345e0fbc582d212f0fe580b83a16b5932640ee63 (diff)
downloadding-libs-bf98ddf34edf25064e96594d782e8418fcd80f77.tar.gz
ding-libs-bf98ddf34edf25064e96594d782e8418fcd80f77.tar.xz
ding-libs-bf98ddf34edf25064e96594d782e8418fcd80f77.zip
Update libcollection with new make environment
-rw-r--r--collection/Makefile.am4
-rw-r--r--collection/configure.ac4
-rw-r--r--collection/trace.h (renamed from trace/trace.h)0
-rw-r--r--trace/Makefile.am3
4 files changed, 4 insertions, 7 deletions
diff --git a/collection/Makefile.am b/collection/Makefile.am
index 4e90aed..1d9e98c 100644
--- a/collection/Makefile.am
+++ b/collection/Makefile.am
@@ -12,7 +12,7 @@ if HAVE_GCC
-Wcast-align -Wwrite-strings
endif
-AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL)
+AM_CPPFLAGS = $(TRACE_LEVEL)
ACLOCAL_AMFLAGS = -I m4
@@ -39,7 +39,7 @@ libcollection_la_SOURCES = \
collection_cmp.c \
collection_iter.c \
collection_priv.h \
- ../trace/trace.h
+ trace.h
libcollection_la_LDFLAGS = \
-version-info 2:0:0
diff --git a/collection/configure.ac b/collection/configure.ac
index 02c0ab4..21723d5 100644
--- a/collection/configure.ac
+++ b/collection/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([collection],
- [0.5.0],
+AC_INIT([libcollection],
+ [0.5.1],
[sssd-devel@lists.fedorahosted.org])
AC_CONFIG_SRCDIR([collection.c])
AC_CONFIG_AUX_DIR([build])
diff --git a/trace/trace.h b/collection/trace.h
index 04aa5c8..04aa5c8 100644
--- a/trace/trace.h
+++ b/collection/trace.h
diff --git a/trace/Makefile.am b/trace/Makefile.am
deleted file mode 100644
index b097ff2..0000000
--- a/trace/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-dist_noinst_HEADERS = trace.h
-
-tests: all