From d734117fc364947d7a4803342378849b0f8362d8 Mon Sep 17 00:00:00 2001
From: Dmitri Pal <dpal@redhat.com>
Date: Wed, 14 Apr 2010 14:09:41 -0400
Subject: Fixing build

---
 common/Makefile.am     | 4 ++--
 common/configure.ac    | 2 +-
 common/ini/Makefile.am | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'common')

diff --git a/common/Makefile.am b/common/Makefile.am
index 0227ee979..187ad5edd 100644
--- a/common/Makefile.am
+++ b/common/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/common/configure.ac b/common/configure.ac
index 5c55baa6f..3bee4ae62 100644
--- a/common/configure.ac
+++ b/common/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/common/ini/Makefile.am b/common/ini/Makefile.am
index 3d9115cd3..a72ce3a0a 100644
--- a/common/ini/Makefile.am
+++ b/common/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:
-- 
cgit