summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitri Pal <dpal@redhat.com>2010-04-14 14:09:41 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-04-14 15:58:53 -0400
commitd734117fc364947d7a4803342378849b0f8362d8 (patch)
treeb82b5d906a0ad2473c25875419b7541d808a65d6
parent9d54d9fc11eb89777b8f87b22dc92742d6fab7a1 (diff)
downloadsssd-d734117fc364947d7a4803342378849b0f8362d8.tar.gz
sssd-d734117fc364947d7a4803342378849b0f8362d8.tar.bz2
sssd-d734117fc364947d7a4803342378849b0f8362d8.zip
Fixing build
-rw-r--r--common/Makefile.am4
-rw-r--r--common/configure.ac2
-rw-r--r--common/ini/Makefile.am5
3 files changed, 6 insertions, 5 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 0227ee97..187ad5ed 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 5c55baa6..3bee4ae6 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 3d9115cd..a72ce3a0 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: