diff options
| author | Dmitri Pal <dpal@redhat.com> | 2010-04-14 14:09:41 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-04-14 15:58:53 -0400 |
| commit | e26fa48aa42eebd2acc22a3731b17a53911dcd4b (patch) | |
| tree | e60e77c2d02cd320c16cd4fe1e23baeb37e16b41 | |
| parent | 35f37fbc241bcc64f99a0d1d619b77ea8b0bce67 (diff) | |
| download | ding-libs-e26fa48aa42eebd2acc22a3731b17a53911dcd4b.tar.gz ding-libs-e26fa48aa42eebd2acc22a3731b17a53911dcd4b.tar.xz ding-libs-e26fa48aa42eebd2acc22a3731b17a53911dcd4b.zip | |
Fixing build
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ini/Makefile.am | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 0227ee9..187ad5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = trace collection ini dhash path_utils refarray -DOCDIRS = collection ini path_utils refarray +SUBDIRS = trace dhash path_utils refarray collection ini +DOCDIRS = path_utils refarray collection ini dist_noinst_DATA = \ m4 diff --git a/configure.ac b/configure.ac index 5c55baa..3bee4ae 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AS_IF([test ["$trace_level" -gt "0"] -a ["$trace_level" -lt "8"] ],[AC_SUBST([TR AC_CONFIG_FILES([Makefile trace/Makefile]) -AC_CONFIG_SUBDIRS([collection dhash ini path_utils refarray]) +AC_CONFIG_SUBDIRS([dhash path_utils refarray collection ini]) AC_DEFUN([WITH_SINGLELIB], [ AC_ARG_WITH([singlelib], diff --git a/ini/Makefile.am b/ini/Makefile.am index 3d9115c..a72ce3a 100644 --- a/ini/Makefile.am +++ b/ini/Makefile.am @@ -13,7 +13,7 @@ if HAVE_GCC -Wcast-align -Wwrite-strings endif -AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection $(TRACE_LEVEL) +AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection -I$(topdir)/path_utils $(TRACE_LEVEL) ACLOCAL_AMFLAGS = -I m4 @@ -39,6 +39,7 @@ libini_config_la_SOURCES = \ libini_config_la_LIBADD = \ -L$(topbuilddir)/collection \ + -L$(topbuilddir)/path_utils \ -lcollection \ -lpath_utils libini_config_la_LDFLAGS = \ @@ -47,7 +48,7 @@ libini_config_la_LDFLAGS = \ # Build unit test check_PROGRAMS = ini_config_ut ini_config_ut_SOURCES = ini_config_ut.c -ini_config_ut_LDADD = libini_config.la -lcollection -lpath_utils +ini_config_ut_LDADD = libini_config.la -L$(topbuilddir)/collection -lcollection if HAVE_DOXYGEN docs: |