From a1f9fb18c7a21adfe3f65064fcc4886bbfb388ea Mon Sep 17 00:00:00 2001 From: Dmitri Pal Date: Mon, 17 May 2010 09:07:46 -0400 Subject: [BO] Adding basic objects to common build --- common/Makefile.am | 6 ++++-- common/configure.ac | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 187ad5e..54c855f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = trace dhash path_utils refarray collection ini -DOCDIRS = path_utils refarray collection ini +SUBDIRS = trace dhash path_utils basicobjects refarray collection ini +DOCDIRS = path_utils basicobjects refarray collection ini dist_noinst_DATA = \ m4 @@ -10,11 +10,13 @@ if SINGLELIB lib_LTLIBRARIES = libsssd_util.la libsssd_util_la_SOURCES = libsssd_util_la_LIBADD = \ + basicobjects/libbasicobjetcs.la \ collection/libcollection.la \ ini/libini_config.la \ dhash/libdhash.la \ refarray/libref_array.la libsssd_util_la_CFLAGS = $(AM_CFLAGS) \ + -I ./simpleobjects \ -I ./collection \ -I ./ini \ -I ./dhash \ diff --git a/common/configure.ac b/common/configure.ac index 3bee4ae..5b3cef6 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([dhash path_utils refarray collection ini]) +AC_CONFIG_SUBDIRS([dhash path_utils basicobjects refarray collection ini]) AC_DEFUN([WITH_SINGLELIB], [ AC_ARG_WITH([singlelib], -- cgit