diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2009-04-06 15:29:07 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-04-06 15:59:21 -0400 |
| commit | 29f9384e70029ebe72ad6199eb8f04c0c92a8981 (patch) | |
| tree | cc42e45043fa2eb6b1b772525234b4b88da9e4a8 | |
| parent | 12454b937b53358e1dbb29dc7649e3f88b9bfd2d (diff) | |
Fix build system for Collection and INI parser.
Adds ini subdirectory so it will be built, adds some clarification
to the README, makes the configure --help more clear about the
trace level and enables -Wall reporting.
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | common/README | 8 | ||||
| -rw-r--r-- | common/collection/Makefile.am | 2 | ||||
| -rw-r--r-- | common/configure.ac | 4 | ||||
| -rw-r--r-- | common/ini/Makefile.am | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 5d39b42b6..b06c0e734 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1 +1 @@ -SUBDIRS = collection +SUBDIRS = collection ini diff --git a/common/README b/common/README index a7db004a5..1b0357349 100644 --- a/common/README +++ b/common/README @@ -1,6 +1,12 @@ TO BUILD EXECUTE: -autoreconf +autoreconf -i ./configure make +If you build first time after getting source use: + +autoreconf -i -f + +Most information about how to use the interfaces can be found in header files +and in the unit tests (*_ut.c). diff --git a/common/collection/Makefile.am b/common/collection/Makefile.am index 06cf953be..bdc111122 100644 --- a/common/collection/Makefile.am +++ b/common/collection/Makefile.am @@ -2,7 +2,7 @@ TRACE_LEVEL=@TRACE_VAR@ topdir=.. -AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL) +AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL) # Build static libraty noinst_LIBRARIES = libcollection.a diff --git a/common/configure.ac b/common/configure.ac index 83a2c1845..941125d07 100644 --- a/common/configure.ac +++ b/common/configure.ac @@ -11,13 +11,13 @@ AC_CONFIG_HEADERS([config.h]) # Enable trace build AC_ARG_ENABLE([trace], - [AS_HELP_STRING([--enable-trace],[build with low level tracing enabled])], + [AS_HELP_STRING([--enable-trace[=LEVEL]],[build with low level tracing enabled])], [trace_level="$enableval"], [trace_level="0"]) 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]) +AC_CONFIG_FILES([Makefile collection/Makefile ini/Makefile]) AC_OUTPUT diff --git a/common/ini/Makefile.am b/common/ini/Makefile.am index a0131e94d..a673aecd8 100644 --- a/common/ini/Makefile.am +++ b/common/ini/Makefile.am @@ -2,7 +2,7 @@ TRACE_LEVEL=@TRACE_VAR@ topdir=.. -AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection $(TRACE_LEVEL) +AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection $(TRACE_LEVEL) # Build static libraty noinst_LIBRARIES = libini_config.a |