diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-10 11:55:27 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-10 12:53:19 -0400 |
| commit | 495361b0106cd29dfa65e57260e22d530e441705 (patch) | |
| tree | c86864c19d49e1edf3a40e1339be0239d3ea48d5 | |
| parent | 868f39c16b548d08560d0dc4f43d684af81004d9 (diff) | |
| download | ding-libs-495361b0106cd29dfa65e57260e22d530e441705.tar.gz ding-libs-495361b0106cd29dfa65e57260e22d530e441705.tar.xz ding-libs-495361b0106cd29dfa65e57260e22d530e441705.zip | |
Update libcollection with new make environment
| -rw-r--r-- | collection/Makefile.am | 4 | ||||
| -rw-r--r-- | collection/trace.h (renamed from trace/trace.h) | 0 | ||||
| -rw-r--r-- | trace/Makefile.am | 3 |
3 files changed, 2 insertions, 5 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/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 |