From 2947e3479131f69defa1b6e7d4ca5dd85c725433 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 9 Apr 2009 08:29:03 -0400
Subject: [PATCH] Build system improvements for the common tools

---
 common/Makefile.am            |    2 +-
 common/collection/Makefile.am |   14 ++++++--------
 common/configure.ac           |    2 +-
 common/ini/Makefile.am        |   14 ++++++--------
 common/trace/Makefile.am      |    1 +
 5 files changed, 15 insertions(+), 18 deletions(-)
 create mode 100644 common/trace/Makefile.am

diff --git a/common/Makefile.am b/common/Makefile.am
index b06c0e7..ea23cb9 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1 +1 @@
-SUBDIRS = collection ini
+SUBDIRS = collection ini trace
diff --git a/common/collection/Makefile.am b/common/collection/Makefile.am
index bdc1111..83b640e 100644
--- a/common/collection/Makefile.am
+++ b/common/collection/Makefile.am
@@ -4,14 +4,12 @@ TRACE_LEVEL=@TRACE_VAR@
 topdir=..
 AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL)
 
-# Build static libraty
-noinst_LIBRARIES = libcollection.a
-libcollection_a_SOURCES = collection.c collection_tools.c collection.h trace.h collection_tools.h collection_class.h
-
-# Build shared library - reserved for future
-# lib_LTLIBRARIES = libcollection.la
-# libcollection_la_SOURCES = collection.c collection_tools.c collection.h trace.h collection_tools.h collection_class.h
+# Build libraty
+lib_LTLIBRARIES = libcollection.la
+libcollection_la_SOURCES = collection.c collection_tools.c collection_tools.h collection_class.h
+include_HEADERS = collection.h
 
+# Build unit test
 noinst_PROGRAMS = collection_ut
 collection_ut_SOURCES = collection_ut.c
-collection_ut_LDADD = libcollection.a -lm -lz
+collection_ut_LDADD = libcollection.la -lm -lz
diff --git a/common/configure.ac b/common/configure.ac
index 941125d..f1a8d64 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -17,7 +17,7 @@ AC_ARG_ENABLE([trace],
 AS_IF([test ["$trace_level" -gt "0"] -a ["$trace_level" -lt "8"] ],[AC_SUBST([TRACE_VAR],["-DTRACE_LEVEL=$trace_level"])])
 
 
-AC_CONFIG_FILES([Makefile collection/Makefile ini/Makefile])
+AC_CONFIG_FILES([Makefile collection/Makefile ini/Makefile trace/Makefile])
 AC_OUTPUT
 
 
diff --git a/common/ini/Makefile.am b/common/ini/Makefile.am
index a673aec..b391f3d 100644
--- a/common/ini/Makefile.am
+++ b/common/ini/Makefile.am
@@ -4,14 +4,12 @@ TRACE_LEVEL=@TRACE_VAR@
 topdir=..
 AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection $(TRACE_LEVEL)
 
-# Build static libraty
-noinst_LIBRARIES = libini_config.a
-libini_config_a_SOURCES = ini_config.c collection.h trace.h collection_tools.h collection_class.h ini_config.h
-
-# Build shared library
-#lib_LTLIBRARIES = libini.la
-#libini_la_SOURCES = ini_config.c collection.h trace.h collection_tools.h collection_class.h ini_config.h
+# Build libraty
+lib_LTLIBRARIES = libini_config.la
+libini_config_la_SOURCES = ini_config.c collection.h collection_tools.h collection_class.h
+include_HEADERS = ini_config.h
 
+# Build unit test
 noinst_PROGRAMS = ini_config_ut
 ini_config_ut_SOURCES = ini_config_ut.c
-ini_config_ut_LDADD = libini_config.a -lm -lz ../collection/libcollection.a
+ini_config_ut_LDADD = libini_config.la -lm -lz ../collection/libcollection.a
diff --git a/common/trace/Makefile.am b/common/trace/Makefile.am
new file mode 100644
index 0000000..489a9d9
--- /dev/null
+++ b/common/trace/Makefile.am
@@ -0,0 +1 @@
+include_HEADERS = trace.h
-- 
1.6.0.6