If possible, please send or upload to the ticket, the warning or error that you get after making this change.
- Mathi. ----- [email protected] wrote: > I have tried it and ran into problems with dependencies, especially > when > doing a parallel build. But also I think it is a cleaner solution > build > common code into libraries. > > / Anders Widell > > On 06/13/2014 11:23 AM, Mathivanan Naickan Palanivelu wrote: > > Alternatively, I think the below change is both backward and forward > compatible! > > Atleast i tried on automake-1.11 for the backward compatibility. > > > > Or May be you already tried this(only the below change) on Ubuntu > 14.04 and probably faced more problems? > > > > diff --git a/configure.ac b/configure.ac > > --- a/configure.ac > > +++ b/configure.ac > > @@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([INSTALL]) > > AC_CONFIG_HEADER([config.h]) > > AC_CONFIG_MACRO_DIR([m4]) > > > > -AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION]) > > +AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION], > [subdir-objects]) > > m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) > > AC_USE_SYSTEM_EXTENSIONS > > > > Thanks, > > Mathi. > > > > ----- [email protected] wrote: > > > >> Makefile.am | 4 +- > >> configure.ac | 11 +++++- > >> contrib/plmc/configure.ac | 6 +- > >> java/ais_api_impl_native/Makefile.am | 34 > >> +++++++++++----------- > >> osaf/Makefile.am | 2 +- > >> osaf/libs/common/immsv/Makefile.am | 11 ++++++- > >> osaf/services/saf/amf/amfd/Makefile.am | 5 +- > >> osaf/services/saf/amf/amfnd/Makefile.am | 2 +- > >> osaf/services/saf/clmsv/clms/Makefile.am | 4 +- > >> osaf/services/saf/cpsv/cpd/Makefile.am | 4 +- > >> osaf/services/saf/edsv/eds/Makefile.am | 2 +- > >> osaf/services/saf/glsv/gld/Makefile.am | 4 +- > >> osaf/services/saf/immsv/immpbed/Makefile.am | 4 +- > >> osaf/services/saf/logsv/lgs/Makefile.am | 2 +- > >> osaf/services/saf/mqsv/mqd/Makefile.am | 4 +- > >> osaf/services/saf/mqsv/mqnd/Makefile.am | 2 +- > >> osaf/services/saf/ntfsv/ntfimcnd/Makefile.am | 2 +- > >> osaf/services/saf/ntfsv/ntfs/Makefile.am | 4 +- > >> osaf/services/saf/plmsv/plms/Makefile.am | 2 +- > >> osaf/services/saf/smfsv/smfd/Makefile.am | 4 +- > >> osaf/tools/safimm/Makefile.am | 2 +- > >> osaf/tools/safimm/immadm/Makefile.am | 2 +- > >> osaf/tools/safimm/immcfg/Makefile.am | 2 +- > >> osaf/tools/safimm/immdump/Makefile.am | 6 +- > >> osaf/tools/safimm/immfind/Makefile.am | 2 +- > >> osaf/tools/safimm/immlist/Makefile.am | 2 +- > >> osaf/tools/safimm/src/Makefile.am | 28 > >> ++++++++++++++++++ > >> osaf/tools/saflog/Makefile.am | 2 +- > >> osaf/tools/saflog/src/Makefile.am | 29 > >> ++++++++++++++++++ > >> osaf/tools/safntf/Makefile.am | 2 +- > >> osaf/tools/safntf/ntfread/Makefile.am | 6 +- > >> osaf/tools/safntf/ntfsend/Makefile.am | 6 +- > >> osaf/tools/safntf/ntfsubscribe/Makefile.am | 6 +- > >> osaf/tools/safntf/src/Makefile.am | 30 > >> +++++++++++++++++++ > >> samples/configure.ac | 6 +- > >> tests/Makefile | 3 +- > >> tests/clmsv/Makefile.am | 32 > >> +++++++++----------- > >> tests/clmsv/src/clmtest.c | 0 > >> tests/clmsv/src/clmtest.h | 0 > >> tests/clmsv/src/tet_ClmOiOps.c | 0 > >> tests/clmsv/src/tet_saClmClusterNodeGet.c | 0 > >> tests/clmsv/src/tet_saClmClusterNodeGetAsync.c | 0 > >> tests/clmsv/src/tet_saClmClusterNotificationFree.c | 0 > >> tests/clmsv/src/tet_saClmClusterTrack.c | 0 > >> tests/clmsv/src/tet_saClmClusterTrackStop.c | 0 > >> tests/clmsv/src/tet_saClmDispatch.c | 0 > >> tests/clmsv/src/tet_saClmFinalize.c | 0 > >> tests/clmsv/src/tet_saClmInitialize.c | 0 > >> tests/clmsv/src/tet_saClmResponse.c | 0 > >> tests/clmsv/src/tet_saClmSelectionObjectGet.c | 0 > >> tests/immsv/common/Makefile.am | 10 ++++++ > >> tests/immsv/implementer/Makefile.am | 10 ++--- > >> tests/immsv/management/Makefile.am | 11 ++---- > >> tests/logsv/Makefile.am | 8 ++-- > >> tests/mds/Makefile.am | 5 +- > >> tests/ntfsv/Makefile.am | 10 +++--- > >> tests/plmsv/Makefile.am | 2 +- > >> tests/plmsv/common/Makefile.am | 27 > >> +++++++++++++++++ > >> tests/plmsv/plms/Makefile.am | 7 +-- > >> tests/unit_test_fw/Makefile.am | 2 +- > >> tests/unit_test_fw/inc/util.h | 1 - > >> tests/unit_test_fw/src/Makefile.am | 30 > >> +++++++++++++++++++ > >> tests/unit_test_fw/src/util.c | 2 +- > >> 63 files changed, 281 insertions(+), 123 deletions(-) > >> > >> > >> The macro AM_INIT_AUTOMAKE is now called without parameters. Also, > the > >> Makefiles > >> no longer reference source files that are not located in the same > >> directory as > >> the Makefile. Instead, a static library is built in these cases, > and > >> the > >> Makefile will reference the library. > >> > >> diff --git a/Makefile.am b/Makefile.am > >> --- a/Makefile.am > >> +++ b/Makefile.am > >> @@ -160,14 +160,14 @@ if ENABLE_TESTS > >> EXTRA_DIST += tests > >> > >> SUBDIRS += \ > >> + tests/unit_test_fw \ > >> tests/logsv \ > >> tests/ntfsv \ > >> tests/immsv \ > >> tests/immsv/implementer \ > >> tests/immsv/management \ > >> tests/clmsv \ > >> - tests/mds \ > >> - tests/unit_test_fw > >> + tests/mds > >> > >> if ENABLE_AIS_PLM > >> SUBDIRS += \ > >> diff --git a/configure.ac b/configure.ac > >> --- a/configure.ac > >> +++ b/configure.ac > >> @@ -15,14 +15,14 @@ > >> # > >> > >> AC_PREREQ([2.61]) > >> -AC_INIT([opensaf], [4.5.M0], > [[email protected]]) > >> +AC_INIT([opensaf], [4.5.M0], > [[email protected]], > >> [opensaf]) > >> AC_CONFIG_AUX_DIR([.]) > >> AC_CANONICAL_SYSTEM > >> -AC_CONFIG_SRCDIR([INSTALL]) > >> +AC_CONFIG_SRCDIR([opensaf.spec.in]) > >> AC_CONFIG_HEADER([config.h]) > >> AC_CONFIG_MACRO_DIR([m4]) > >> > >> -AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION]) > >> +AM_INIT_AUTOMAKE > >> m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) > >> AC_USE_SYSTEM_EXTENSIONS > >> > >> @@ -872,11 +872,14 @@ AC_CONFIG_FILES([ > >> osaf/tools/safimm/immlist/Makefile > >> osaf/tools/safimm/immxml/Makefile > >> osaf/tools/safimm/include/Makefile > >> + osaf/tools/safimm/src/Makefile > >> osaf/tools/saflog/Makefile > >> osaf/tools/saflog/include/Makefile > >> osaf/tools/saflog/saflogger/Makefile > >> + osaf/tools/saflog/src/Makefile > >> osaf/tools/safntf/Makefile > >> osaf/tools/safntf/include/Makefile > >> + osaf/tools/safntf/src/Makefile > >> osaf/tools/safntf/ntfsend/Makefile > >> osaf/tools/safntf/ntfsubscribe/Makefile > >> osaf/tools/safntf/ntfread/Makefile > >> @@ -891,10 +894,12 @@ AC_CONFIG_FILES([ > >> tests/logsv/Makefile > >> tests/clmsv/Makefile > >> tests/ntfsv/Makefile > >> + tests/plmsv/common/Makefile > >> tests/plmsv/plms/Makefile > >> tests/plmsv/Makefile > >> tests/mds/Makefile > >> tests/unit_test_fw/Makefile > >> + tests/unit_test_fw/src/Makefile > >> tests/unit_test_fw/inc/Makefile]) > >> > >> AC_CONFIG_SUBDIRS([contrib/plmc]) > >> diff --git a/contrib/plmc/configure.ac b/contrib/plmc/configure.ac > >> --- a/contrib/plmc/configure.ac > >> +++ b/contrib/plmc/configure.ac > >> @@ -14,15 +14,15 @@ > >> # Author(s): Wind River Systems > >> # > >> > >> -AC_PREREQ([2.59]) > >> -AC_INIT([plmc], [0.9], [[email protected]]) > >> +AC_PREREQ([2.61]) > >> +AC_INIT([plmc], [0.9], [[email protected]], > >> [plmc]) > >> AC_CONFIG_AUX_DIR([.]) > >> AC_CANONICAL_SYSTEM > >> AC_CONFIG_SRCDIR([INSTALL]) > >> AC_CONFIG_HEADER([config.h]) > >> AC_CONFIG_MACRO_DIR([m4]) > >> > >> -AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION]) > >> +AM_INIT_AUTOMAKE > >> m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) > >> > >> # > >> diff --git a/java/ais_api_impl_native/Makefile.am > >> b/java/ais_api_impl_native/Makefile.am > >> --- a/java/ais_api_impl_native/Makefile.am > >> +++ b/java/ais_api_impl_native/Makefile.am > >> @@ -51,23 +51,23 @@ libjava_ais_api_native_la_CPPFLAGS = \ > >> -DSA_CLM_B01 > >> > >> libjava_ais_api_native_la_SOURCES = \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_compRegistry.c > \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_csiManager.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_errReporting.c > \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_healthcheck.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_libHandle.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_pgManager.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_amf_pm.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_clm.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_clm_libHandle.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_clm_manager.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_libHandle.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_ais_socketUtil.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_utils.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/j_utilsPrint.c \ > >> - $(top_srcdir)/java/ais_api_impl_native/tracer.c > >> + j_ais.c \ > >> + j_ais_amf.c \ > >> + j_ais_amf_compRegistry.c \ > >> + j_ais_amf_csiManager.c \ > >> + j_ais_amf_errReporting.c \ > >> + j_ais_amf_healthcheck.c \ > >> + j_ais_amf_libHandle.c \ > >> + j_ais_amf_pgManager.c \ > >> + j_ais_amf_pm.c \ > >> + j_ais_clm.c \ > >> + j_ais_clm_libHandle.c \ > >> + j_ais_clm_manager.c \ > >> + j_ais_libHandle.c \ > >> + j_ais_socketUtil.c \ > >> + j_utils.c \ > >> + j_utilsPrint.c \ > >> + tracer.c > >> > >> libjava_ais_api_native_la_LIBADD = \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> diff --git a/osaf/Makefile.am b/osaf/Makefile.am > >> --- a/osaf/Makefile.am > >> +++ b/osaf/Makefile.am > >> @@ -18,4 +18,4 @@ include $(top_srcdir)/Makefile.common > >> > >> MAINTAINERCLEANFILES = Makefile.in > >> > >> -SUBDIRS = libs services tools > >> +SUBDIRS = libs tools services > >> diff --git a/osaf/libs/common/immsv/Makefile.am > >> b/osaf/libs/common/immsv/Makefile.am > >> --- a/osaf/libs/common/immsv/Makefile.am > >> +++ b/osaf/libs/common/immsv/Makefile.am > >> @@ -20,7 +20,7 @@ MAINTAINERCLEANFILES = Makefile.in > >> > >> SUBDIRS = include > >> > >> -noinst_LTLIBRARIES = libimmsv_common.la > >> +noinst_LTLIBRARIES = libimmsv_common.la libimmpbe_dump.la > >> > >> libimmsv_common_la_CPPFLAGS = \ > >> $(AM_CPPFLAGS) \ > >> @@ -28,3 +28,12 @@ libimmsv_common_la_CPPFLAGS = \ > >> > >> libimmsv_common_la_SOURCES = \ > >> immsv_evt.c > >> + > >> +libimmpbe_dump_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) \ > >> + -I$(top_srcdir)/osaf/libs/common/immsv/include > >> + > >> +libimmpbe_dump_la_LDFLAGS = @SQLITE3_LIBS@ > >> + > >> +libimmpbe_dump_la_SOURCES = \ > >> + immpbe_dump.cc > >> diff --git a/osaf/services/saf/amf/amfd/Makefile.am > >> b/osaf/services/saf/amf/amfd/Makefile.am > >> --- a/osaf/services/saf/amf/amfd/Makefile.am > >> +++ b/osaf/services/saf/amf/amfd/Makefile.am > >> @@ -34,8 +34,6 @@ osafamfd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/tools/saflog/include > >> > >> osafamfd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> - $(top_srcdir)/osaf/tools/saflog/src/saflog.c \ > >> app.cc \ > >> apptype.cc \ > >> chkop.cc \ > >> @@ -88,6 +86,8 @@ osafamfd_SOURCES = \ > >> util.cc > >> > >> osafamfd_LDADD = \ > >> + $(top_builddir)/osaf/tools/saflog/src/libsaflog.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/amf/libamf_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la \ > >> @@ -96,4 +96,3 @@ osafamfd_LDADD = \ > >> $(top_builddir)/osaf/libs/saf/libSaClm/libSaClm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaLog/libSaLog.la \ > >> $(top_builddir)/osaf/libs/agents/infrastructure/rda/librda.la > >> - > >> diff --git a/osaf/services/saf/amf/amfnd/Makefile.am > >> b/osaf/services/saf/amf/amfnd/Makefile.am > >> --- a/osaf/services/saf/amf/amfnd/Makefile.am > >> +++ b/osaf/services/saf/amf/amfnd/Makefile.am > >> @@ -33,7 +33,6 @@ osafamfnd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osafamfnd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> amfnd.cc \ > >> cam.cc \ > >> cbq.cc \ > >> @@ -69,6 +68,7 @@ osafamfnd_SOURCES = \ > >> verify.cc > >> > >> osafamfnd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/amf/libamf_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> diff --git a/osaf/services/saf/clmsv/clms/Makefile.am > >> b/osaf/services/saf/clmsv/clms/Makefile.am > >> --- a/osaf/services/saf/clmsv/clms/Makefile.am > >> +++ b/osaf/services/saf/clmsv/clms/Makefile.am > >> @@ -38,8 +38,6 @@ osafclmd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/tools/saflog/include > >> > >> osafclmd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> - $(top_srcdir)/osaf/tools/saflog/src/saflog.c \ > >> clms_amf.c \ > >> clms_evt.c \ > >> clms_imm.c \ > >> @@ -50,6 +48,8 @@ osafclmd_SOURCES = \ > >> clms_mds.c > >> > >> osafclmd_LDADD = \ > >> + $(top_builddir)/osaf/tools/saflog/src/libsaflog.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/clmsv/libclmsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> diff --git a/osaf/services/saf/cpsv/cpd/Makefile.am > >> b/osaf/services/saf/cpsv/cpd/Makefile.am > >> --- a/osaf/services/saf/cpsv/cpd/Makefile.am > >> +++ b/osaf/services/saf/cpsv/cpd/Makefile.am > >> @@ -31,7 +31,6 @@ osafckptd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osafckptd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> cpd_amf.c \ > >> cpd_db.c \ > >> cpd_evt.c \ > >> @@ -46,9 +45,10 @@ osafckptd_SOURCES = \ > >> cpd_tmr.c > >> > >> osafckptd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/cpsv/libcpsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaClm/libSaClm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> - $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la > >> + $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la > >> diff --git a/osaf/services/saf/edsv/eds/Makefile.am > >> b/osaf/services/saf/edsv/eds/Makefile.am > >> --- a/osaf/services/saf/edsv/eds/Makefile.am > >> +++ b/osaf/services/saf/edsv/eds/Makefile.am > >> @@ -31,7 +31,6 @@ osafevtd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osafevtd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> eds_amf.c \ > >> eds_api.c \ > >> eds_cb.c \ > >> @@ -46,6 +45,7 @@ osafevtd_SOURCES = \ > >> eds_util.c > >> > >> osafevtd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/edsv/libedsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> diff --git a/osaf/services/saf/glsv/gld/Makefile.am > >> b/osaf/services/saf/glsv/gld/Makefile.am > >> --- a/osaf/services/saf/glsv/gld/Makefile.am > >> +++ b/osaf/services/saf/glsv/gld/Makefile.am > >> @@ -33,7 +33,6 @@ osaflckd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osaflckd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> gld_amf.c \ > >> gld_api.c \ > >> gld_evt.c \ > >> @@ -47,8 +46,9 @@ osaflckd_SOURCES = \ > >> gld_tmr.c > >> > >> osaflckd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/glsv/libglsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> - $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la > >> + $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la > >> diff --git a/osaf/services/saf/immsv/immpbed/Makefile.am > >> b/osaf/services/saf/immsv/immpbed/Makefile.am > >> --- a/osaf/services/saf/immsv/immpbed/Makefile.am > >> +++ b/osaf/services/saf/immsv/immpbed/Makefile.am > >> @@ -27,9 +27,7 @@ osaf_execbin_PROGRAMS = osafimmpbed > >> osafimmpbed_CXXFLAGS = $(AM_CXXFLAGS) @XML2_CFLAGS@ > @SQLITE3_CFLAGS@ > >> > >> osafimmpbed_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> immpbe.cc \ > >> - $(top_builddir)/osaf/libs/common/immsv/immpbe_dump.cc \ > >> immpbe_daemon.cc > >> > >> osafimmpbed_CPPFLAGS = \ > >> @@ -39,6 +37,8 @@ osafimmpbed_CPPFLAGS = \ > >> osafimmpbed_LDFLAGS = @XML2_LIBS@ @SQLITE3_LIBS@ -lpthread > >> > >> osafimmpbed_LDADD = \ > >> + $(top_builddir)/osaf/libs/common/immsv/libimmpbe_dump.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la > >> diff --git a/osaf/services/saf/logsv/lgs/Makefile.am > >> b/osaf/services/saf/logsv/lgs/Makefile.am > >> --- a/osaf/services/saf/logsv/lgs/Makefile.am > >> +++ b/osaf/services/saf/logsv/lgs/Makefile.am > >> @@ -43,7 +43,6 @@ osaflogd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osaflogd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> lgs_amf.c \ > >> lgs_evt.c \ > >> lgs_fmt.c \ > >> @@ -59,6 +58,7 @@ osaflogd_SOURCES = \ > >> lgs_filehdl.c > >> > >> osaflogd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> diff --git a/osaf/services/saf/mqsv/mqd/Makefile.am > >> b/osaf/services/saf/mqsv/mqd/Makefile.am > >> --- a/osaf/services/saf/mqsv/mqd/Makefile.am > >> +++ b/osaf/services/saf/mqsv/mqd/Makefile.am > >> @@ -31,7 +31,6 @@ osafmsgd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osafmsgd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> mqd_sbevt.c \ > >> mqd_mbcsv.c \ > >> mqd_mbedu.c \ > >> @@ -48,9 +47,10 @@ osafmsgd_SOURCES = \ > >> mqd_tmr.c > >> > >> osafmsgd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/mqsv/libmqsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaClm/libSaClm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> - $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la > >> + $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la > >> diff --git a/osaf/services/saf/mqsv/mqnd/Makefile.am > >> b/osaf/services/saf/mqsv/mqnd/Makefile.am > >> --- a/osaf/services/saf/mqsv/mqnd/Makefile.am > >> +++ b/osaf/services/saf/mqsv/mqnd/Makefile.am > >> @@ -31,7 +31,6 @@ osafmsgnd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osafmsgnd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> mqnd_amf.c \ > >> mqnd_db.c \ > >> mqnd_evt.c \ > >> @@ -48,6 +47,7 @@ osafmsgnd_SOURCES = \ > >> mqnd_util.c > >> > >> osafmsgnd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/mqsv/libmqsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> diff --git a/osaf/services/saf/ntfsv/ntfimcnd/Makefile.am > >> b/osaf/services/saf/ntfsv/ntfimcnd/Makefile.am > >> --- a/osaf/services/saf/ntfsv/ntfimcnd/Makefile.am > >> +++ b/osaf/services/saf/ntfsv/ntfimcnd/Makefile.am > >> @@ -32,12 +32,12 @@ osafntfimcnd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> osafntfimcnd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> ntfimcn_main.c \ > >> ntfimcn_notifier.c \ > >> ntfimcn_imm.c > >> > >> osafntfimcnd_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> diff --git a/osaf/services/saf/ntfsv/ntfs/Makefile.am > >> b/osaf/services/saf/ntfsv/ntfs/Makefile.am > >> --- a/osaf/services/saf/ntfsv/ntfs/Makefile.am > >> +++ b/osaf/services/saf/ntfsv/ntfs/Makefile.am > >> @@ -44,7 +44,6 @@ osafntfd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/tools/saflog/include > >> > >> osafntfd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/saflog/src/saflog.c \ > >> ntfs_amf.c \ > >> ntfs_evt.c \ > >> ntfs_mbcsv.c \ > >> @@ -66,8 +65,9 @@ osafntfd_SOURCES += ntfs_imcnutil.c > >> endif > >> > >> osafntfd_LDADD = \ > >> + $(top_builddir)/osaf/tools/saflog/src/libsaflog.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/ntfsv/libntfsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaLog/libSaLog.la \ > >> - $(top_builddir)/osaf/libs/agents/infrastructure/rda/librda.la > >> + $(top_builddir)/osaf/libs/agents/infrastructure/rda/librda.la > >> diff --git a/osaf/services/saf/plmsv/plms/Makefile.am > >> b/osaf/services/saf/plmsv/plms/Makefile.am > >> --- a/osaf/services/saf/plmsv/plms/Makefile.am > >> +++ b/osaf/services/saf/plmsv/plms/Makefile.am > >> @@ -34,7 +34,6 @@ osafplmd_CPPFLAGS = \ > >> osafplmd_CFLAGS = $(AM_CFLAGS) @HPI_CFLAGS@ > >> > >> osafplmd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> plms_main.c \ > >> plms_amf.c \ > >> plms_mds.c \ > >> @@ -51,6 +50,7 @@ osafplmd_SOURCES = \ > >> > >> osafplmd_LDADD = \ > >> @HPI_LIBS@ \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/plmsv/plmc/libplmc.la \ > >> $(top_builddir)/osaf/libs/common/plmsv/libplmsv_common.la \ > >> diff --git a/osaf/services/saf/smfsv/smfd/Makefile.am > >> b/osaf/services/saf/smfsv/smfd/Makefile.am > >> --- a/osaf/services/saf/smfsv/smfd/Makefile.am > >> +++ b/osaf/services/saf/smfsv/smfd/Makefile.am > >> @@ -61,8 +61,6 @@ osafsmfd_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/tools/saflog/include > >> > >> osafsmfd_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> - $(top_srcdir)/osaf/tools/saflog/src/saflog.c \ > >> smfd_amf.c \ > >> smfd_evt.c \ > >> smfd_main.c \ > >> @@ -96,6 +94,8 @@ osafsmfd_LDFLAGS = \ > >> @XML2_LIBS@ > >> > >> osafsmfd_LDADD = \ > >> + $(top_builddir)/osaf/tools/saflog/src/libsaflog.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/common/smfsv/libsmfsv_common.la \ > >> $(top_builddir)/osaf/libs/saf/libSaSmf/libSaSmf.la \ > >> diff --git a/osaf/tools/safimm/Makefile.am > >> b/osaf/tools/safimm/Makefile.am > >> --- a/osaf/tools/safimm/Makefile.am > >> +++ b/osaf/tools/safimm/Makefile.am > >> @@ -18,7 +18,7 @@ include $(top_srcdir)/Makefile.common > >> > >> MAINTAINERCLEANFILES = Makefile.in > >> > >> -SUBDIRS = include immcfg immdump immadm immfind immlist > >> +SUBDIRS = include src immcfg immdump immadm immfind immlist > >> > >> if ENABLE_IMMXML > >> > >> diff --git a/osaf/tools/safimm/immadm/Makefile.am > >> b/osaf/tools/safimm/immadm/Makefile.am > >> --- a/osaf/tools/safimm/immadm/Makefile.am > >> +++ b/osaf/tools/safimm/immadm/Makefile.am > >> @@ -26,10 +26,10 @@ immadm_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> immadm_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> imm_admin.c > >> > >> immadm_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la > >> diff --git a/osaf/tools/safimm/immcfg/Makefile.am > >> b/osaf/tools/safimm/immcfg/Makefile.am > >> --- a/osaf/tools/safimm/immcfg/Makefile.am > >> +++ b/osaf/tools/safimm/immcfg/Makefile.am > >> @@ -33,7 +33,6 @@ immcfg_CPPFLAGS = \ > >> @XML2_CFLAGS@ > >> > >> immcfg_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> imm_import.cc \ > >> imm_cfg.c > >> > >> @@ -42,6 +41,7 @@ immcfg_LDFLAGS = \ > >> -ldl > >> > >> immcfg_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la > >> diff --git a/osaf/tools/safimm/immdump/Makefile.am > >> b/osaf/tools/safimm/immdump/Makefile.am > >> --- a/osaf/tools/safimm/immdump/Makefile.am > >> +++ b/osaf/tools/safimm/immdump/Makefile.am > >> @@ -26,18 +26,18 @@ bin_PROGRAMS = immdump > >> immdump_CXXFLAGS = $(AM_CXXFLAGS) @XML2_CFLAGS@ @SQLITE3_CFLAGS@ > >> > >> immdump_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> imm_dumper.cc \ > >> - $(top_builddir)/osaf/libs/common/immsv/immpbe_dump.cc \ > >> imm_xmlw_dump.cc > >> > >> immdump_CPPFLAGS = \ > >> $(AM_CPPFLAGS) \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> -immdump_LDFLAGS = @XML2_LIBS@ @SQLITE3_LIBS@ > >> +immdump_LDFLAGS = @XML2_LIBS@ > >> > >> immdump_LDADD = \ > >> + $(top_builddir)/osaf/libs/common/immsv/libimmpbe_dump.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la > >> diff --git a/osaf/tools/safimm/immfind/Makefile.am > >> b/osaf/tools/safimm/immfind/Makefile.am > >> --- a/osaf/tools/safimm/immfind/Makefile.am > >> +++ b/osaf/tools/safimm/immfind/Makefile.am > >> @@ -31,10 +31,10 @@ immfind_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> immfind_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> imm_find.c > >> > >> immfind_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la > >> diff --git a/osaf/tools/safimm/immlist/Makefile.am > >> b/osaf/tools/safimm/immlist/Makefile.am > >> --- a/osaf/tools/safimm/immlist/Makefile.am > >> +++ b/osaf/tools/safimm/immlist/Makefile.am > >> @@ -26,10 +26,10 @@ immlist_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> immlist_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> imm_list.c > >> > >> immlist_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la > >> diff --git a/osaf/tools/safimm/src/Makefile.am > >> b/osaf/tools/safimm/src/Makefile.am > >> new file mode 100644 > >> --- /dev/null > >> +++ b/osaf/tools/safimm/src/Makefile.am > >> @@ -0,0 +1,28 @@ > >> +# -*- OpenSAF -*- > >> +# > >> +# (C) Copyright 2014 The OpenSAF Foundation > >> +# > >> +# This program is distributed in the hope that it will be useful, > >> but > >> +# WITHOUT ANY WARRANTY; without even the implied warranty of > >> MERCHANTABILITY > >> +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > >> licensed > >> +# under the GNU Lesser General Public License Version 2.1, > February > >> 1999. > >> +# The complete license can be accessed from the following > location: > >> +# http://opensource.org/licenses/lgpl-license.php > >> +# See the Copying file included with the OpenSAF distribution for > >> full > >> +# licensing terms. > >> +# > >> +# Author(s): Ericsson AB > >> +# > >> + > >> +include $(top_srcdir)/Makefile.common > >> + > >> +MAINTAINERCLEANFILES = Makefile.in > >> + > >> +noinst_LTLIBRARIES = libimmutil.la > >> + > >> +libimmutil_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) \ > >> + -I$(top_srcdir)/osaf/libs/common/immsv/include > >> + > >> +libimmutil_la_SOURCES = \ > >> + immutil.c > >> diff --git a/osaf/tools/saflog/Makefile.am > >> b/osaf/tools/saflog/Makefile.am > >> --- a/osaf/tools/saflog/Makefile.am > >> +++ b/osaf/tools/saflog/Makefile.am > >> @@ -18,4 +18,4 @@ include $(top_srcdir)/Makefile.common > >> > >> MAINTAINERCLEANFILES = Makefile.in > >> > >> -SUBDIRS = include saflogger > >> +SUBDIRS = include src saflogger > >> diff --git a/osaf/tools/saflog/src/Makefile.am > >> b/osaf/tools/saflog/src/Makefile.am > >> new file mode 100644 > >> --- /dev/null > >> +++ b/osaf/tools/saflog/src/Makefile.am > >> @@ -0,0 +1,29 @@ > >> +# -*- OpenSAF -*- > >> +# > >> +# (C) Copyright 2014 The OpenSAF Foundation > >> +# > >> +# This program is distributed in the hope that it will be useful, > >> but > >> +# WITHOUT ANY WARRANTY; without even the implied warranty of > >> MERCHANTABILITY > >> +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > >> licensed > >> +# under the GNU Lesser General Public License Version 2.1, > February > >> 1999. > >> +# The complete license can be accessed from the following > location: > >> +# http://opensource.org/licenses/lgpl-license.php > >> +# See the Copying file included with the OpenSAF distribution for > >> full > >> +# licensing terms. > >> +# > >> +# Author(s): Ericsson AB > >> +# > >> + > >> +include $(top_srcdir)/Makefile.common > >> + > >> +MAINTAINERCLEANFILES = Makefile.in > >> + > >> +noinst_LTLIBRARIES = libsaflog.la > >> + > >> +libsaflog_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) \ > >> + -I$(top_srcdir)/osaf/libs/saf/include \ > >> + -I$(top_srcdir)/osaf/tools/saflog/include > >> + > >> +libsaflog_la_SOURCES = \ > >> + saflog.c > >> diff --git a/osaf/tools/safntf/Makefile.am > >> b/osaf/tools/safntf/Makefile.am > >> --- a/osaf/tools/safntf/Makefile.am > >> +++ b/osaf/tools/safntf/Makefile.am > >> @@ -18,5 +18,5 @@ include $(top_srcdir)/Makefile.common > >> > >> MAINTAINERCLEANFILES = Makefile.in > >> > >> -SUBDIRS = include ntfsend ntfsubscribe ntfread > >> +SUBDIRS = include src ntfsend ntfsubscribe ntfread > >> > >> diff --git a/osaf/tools/safntf/ntfread/Makefile.am > >> b/osaf/tools/safntf/ntfread/Makefile.am > >> --- a/osaf/tools/safntf/ntfread/Makefile.am > >> +++ b/osaf/tools/safntf/ntfread/Makefile.am > >> @@ -27,9 +27,9 @@ ntfread_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/ntfsv/include > >> > >> ntfread_SOURCES = \ > >> - ntfread.c \ > >> - ../src/ntfclient.c > >> + ntfread.c > >> > >> ntfread_LDADD = \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> - $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la > >> + $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la \ > >> + $(top_builddir)/osaf/tools/safntf/src/libntfclient.la > >> diff --git a/osaf/tools/safntf/ntfsend/Makefile.am > >> b/osaf/tools/safntf/ntfsend/Makefile.am > >> --- a/osaf/tools/safntf/ntfsend/Makefile.am > >> +++ b/osaf/tools/safntf/ntfsend/Makefile.am > >> @@ -27,9 +27,9 @@ ntfsend_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/ntfsv/include > >> > >> ntfsend_SOURCES = \ > >> - ntfsend.c\ > >> - ../src/ntfclient.c > >> + ntfsend.c > >> > >> ntfsend_LDADD = \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> - $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la > >> + $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la \ > >> + $(top_builddir)/osaf/tools/safntf/src/libntfclient.la > >> diff --git a/osaf/tools/safntf/ntfsubscribe/Makefile.am > >> b/osaf/tools/safntf/ntfsubscribe/Makefile.am > >> --- a/osaf/tools/safntf/ntfsubscribe/Makefile.am > >> +++ b/osaf/tools/safntf/ntfsubscribe/Makefile.am > >> @@ -27,10 +27,10 @@ ntfsubscribe_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/ntfsv/include > >> > >> ntfsubscribe_SOURCES = \ > >> - ntfsubscribe.c\ > >> - ../src/ntfclient.c > >> + ntfsubscribe.c > >> > >> > >> ntfsubscribe_LDADD = \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> - $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la > >> + $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la \ > >> + $(top_builddir)/osaf/tools/safntf/src/libntfclient.la > >> diff --git a/osaf/tools/safntf/src/Makefile.am > >> b/osaf/tools/safntf/src/Makefile.am > >> new file mode 100644 > >> --- /dev/null > >> +++ b/osaf/tools/safntf/src/Makefile.am > >> @@ -0,0 +1,30 @@ > >> +# -*- OpenSAF -*- > >> +# > >> +# (C) Copyright 2014 The OpenSAF Foundation > >> +# > >> +# This program is distributed in the hope that it will be useful, > >> but > >> +# WITHOUT ANY WARRANTY; without even the implied warranty of > >> MERCHANTABILITY > >> +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > >> licensed > >> +# under the GNU Lesser General Public License Version 2.1, > February > >> 1999. > >> +# The complete license can be accessed from the following > location: > >> +# http://opensource.org/licenses/lgpl-license.php > >> +# See the Copying file included with the OpenSAF distribution for > >> full > >> +# licensing terms. > >> +# > >> +# Author(s): Ericsson AB > >> +# > >> + > >> +include $(top_srcdir)/Makefile.common > >> + > >> +MAINTAINERCLEANFILES = Makefile.in > >> + > >> +noinst_LTLIBRARIES = libntfclient.la > >> + > >> +libntfclient_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) \ > >> + -I$(top_srcdir)/osaf/libs/saf/include \ > >> + -I$(top_srcdir)/osaf/tools/safntf/include \ > >> + -I$(top_srcdir)/osaf/libs/common/ntfsv/include > >> + > >> +libntfclient_la_SOURCES = \ > >> + ntfclient.c > >> diff --git a/samples/configure.ac b/samples/configure.ac > >> --- a/samples/configure.ac > >> +++ b/samples/configure.ac > >> @@ -14,15 +14,15 @@ > >> # Author(s): Wind River Systems > >> # > >> > >> -AC_PREREQ([2.59]) > >> -AC_INIT([opensafdemo], [0.9], > [[email protected]]) > >> +AC_PREREQ([2.61]) > >> +AC_INIT([opensafdemo], [0.9], > [[email protected]], > >> [opensafdemo]) > >> AC_CONFIG_AUX_DIR([.]) > >> AC_CANONICAL_SYSTEM > >> AC_CONFIG_SRCDIR([INSTALL]) > >> AC_CONFIG_HEADER([config.h]) > >> AC_CONFIG_MACRO_DIR([m4]) > >> > >> -AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION]) > >> +AM_INIT_AUTOMAKE > >> > >> # > >> # Check for configure deps > >> diff --git a/tests/Makefile b/tests/Makefile > >> --- a/tests/Makefile > >> +++ b/tests/Makefile > >> @@ -52,6 +52,7 @@ include Makefile.common > >> # add logsv to this list when it's ready > >> # > >> SERVICES_DIRS := \ > >> + unit_test_fw \ > >> cpsv \ > >> edsv \ > >> glsv \ > >> @@ -73,7 +74,7 @@ TET_SUITE_FILES := \ > >> $(SERVICES_DIRS) > >> > >> TETSUITES := tet_suites_$(TARGET_ARCH) > >> - > >> + > >> all clean clobber: $(SERVICES_DIRS) > >> > >> tetsuites: all > >> diff --git a/tests/clmsv/Makefile.am b/tests/clmsv/Makefile.am > >> --- a/tests/clmsv/Makefile.am > >> +++ b/tests/clmsv/Makefile.am > >> @@ -22,7 +22,7 @@ MAINTAINERCLEANFILES = Makefile.in > >> bin_PROGRAMS = clmtest > >> > >> noinst_HEADERS = \ > >> - $(top_srcdir)/tests/clmsv/src/clmtest.h > >> + clmtest.h > >> > >> clmtest_CPPFLAGS = \ > >> -DSA_CLM_B01=1 \ > >> @@ -30,22 +30,20 @@ clmtest_CPPFLAGS = \ > >> -I$(top_srcdir)/tests/unit_test_fw/inc > >> > >> clmtest_SOURCES = \ > >> - $(top_srcdir)/osaf/libs/core/common/logtrace.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/tests/clmsv/src/clmtest.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmInitialize.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmClusterNodeGetAsync.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmClusterTrack.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmClusterTrackStop.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmClusterNotificationFree.c > \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmClusterNodeGet.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmResponse.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_ClmOiOps.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmDispatch.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmSelectionObjectGet.c \ > >> - $(top_srcdir)/tests/clmsv/src/tet_saClmFinalize.c > >> + clmtest.c \ > >> + tet_saClmInitialize.c \ > >> + tet_saClmClusterNodeGetAsync.c \ > >> + tet_saClmClusterTrack.c \ > >> + tet_saClmClusterTrackStop.c \ > >> + tet_saClmClusterNotificationFree.c \ > >> + tet_saClmClusterNodeGet.c \ > >> + tet_saClmResponse.c \ > >> + tet_ClmOiOps.c \ > >> + tet_saClmDispatch.c \ > >> + tet_saClmSelectionObjectGet.c \ > >> + tet_saClmFinalize.c > >> > >> clmtest_LDADD = \ > >> $(top_builddir)/osaf/libs/saf/libSaClm/libSaClm.la \ > >> - $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> + $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la > >> diff --git a/tests/clmsv/src/clmtest.c b/tests/clmsv/clmtest.c > >> rename from tests/clmsv/src/clmtest.c > >> rename to tests/clmsv/clmtest.c > >> diff --git a/tests/clmsv/src/clmtest.h b/tests/clmsv/clmtest.h > >> rename from tests/clmsv/src/clmtest.h > >> rename to tests/clmsv/clmtest.h > >> diff --git a/tests/clmsv/src/tet_ClmOiOps.c > >> b/tests/clmsv/tet_ClmOiOps.c > >> rename from tests/clmsv/src/tet_ClmOiOps.c > >> rename to tests/clmsv/tet_ClmOiOps.c > >> diff --git a/tests/clmsv/src/tet_saClmClusterNodeGet.c > >> b/tests/clmsv/tet_saClmClusterNodeGet.c > >> rename from tests/clmsv/src/tet_saClmClusterNodeGet.c > >> rename to tests/clmsv/tet_saClmClusterNodeGet.c > >> diff --git a/tests/clmsv/src/tet_saClmClusterNodeGetAsync.c > >> b/tests/clmsv/tet_saClmClusterNodeGetAsync.c > >> rename from tests/clmsv/src/tet_saClmClusterNodeGetAsync.c > >> rename to tests/clmsv/tet_saClmClusterNodeGetAsync.c > >> diff --git a/tests/clmsv/src/tet_saClmClusterNotificationFree.c > >> b/tests/clmsv/tet_saClmClusterNotificationFree.c > >> rename from tests/clmsv/src/tet_saClmClusterNotificationFree.c > >> rename to tests/clmsv/tet_saClmClusterNotificationFree.c > >> diff --git a/tests/clmsv/src/tet_saClmClusterTrack.c > >> b/tests/clmsv/tet_saClmClusterTrack.c > >> rename from tests/clmsv/src/tet_saClmClusterTrack.c > >> rename to tests/clmsv/tet_saClmClusterTrack.c > >> diff --git a/tests/clmsv/src/tet_saClmClusterTrackStop.c > >> b/tests/clmsv/tet_saClmClusterTrackStop.c > >> rename from tests/clmsv/src/tet_saClmClusterTrackStop.c > >> rename to tests/clmsv/tet_saClmClusterTrackStop.c > >> diff --git a/tests/clmsv/src/tet_saClmDispatch.c > >> b/tests/clmsv/tet_saClmDispatch.c > >> rename from tests/clmsv/src/tet_saClmDispatch.c > >> rename to tests/clmsv/tet_saClmDispatch.c > >> diff --git a/tests/clmsv/src/tet_saClmFinalize.c > >> b/tests/clmsv/tet_saClmFinalize.c > >> rename from tests/clmsv/src/tet_saClmFinalize.c > >> rename to tests/clmsv/tet_saClmFinalize.c > >> diff --git a/tests/clmsv/src/tet_saClmInitialize.c > >> b/tests/clmsv/tet_saClmInitialize.c > >> rename from tests/clmsv/src/tet_saClmInitialize.c > >> rename to tests/clmsv/tet_saClmInitialize.c > >> diff --git a/tests/clmsv/src/tet_saClmResponse.c > >> b/tests/clmsv/tet_saClmResponse.c > >> rename from tests/clmsv/src/tet_saClmResponse.c > >> rename to tests/clmsv/tet_saClmResponse.c > >> diff --git a/tests/clmsv/src/tet_saClmSelectionObjectGet.c > >> b/tests/clmsv/tet_saClmSelectionObjectGet.c > >> rename from tests/clmsv/src/tet_saClmSelectionObjectGet.c > >> rename to tests/clmsv/tet_saClmSelectionObjectGet.c > >> diff --git a/tests/immsv/common/Makefile.am > >> b/tests/immsv/common/Makefile.am > >> --- a/tests/immsv/common/Makefile.am > >> +++ b/tests/immsv/common/Makefile.am > >> @@ -20,3 +20,13 @@ MAINTAINERCLEANFILES = Makefile.in > >> > >> noinst_HEADERS = \ > >> immtest.h > >> + > >> +noinst_LTLIBRARIES = libimmtest.la > >> + > >> +libimmtest_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) \ > >> + -I$(top_srcdir)/tests/unit_test_fw/inc \ > >> + -I$(top_srcdir)/osaf/libs/saf/include > >> + > >> +libimmtest_la_SOURCES = \ > >> + immtest.c > >> diff --git a/tests/immsv/implementer/Makefile.am > >> b/tests/immsv/implementer/Makefile.am > >> --- a/tests/immsv/implementer/Makefile.am > >> +++ b/tests/immsv/implementer/Makefile.am > >> @@ -27,9 +27,6 @@ immoitest_CPPFLAGS = \ > >> -I$(top_srcdir)/tests/unit_test_fw/inc > >> > >> immoitest_SOURCES = \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/immsv/common/immtest.c \ > >> test_saImmOiInitialize_2.c \ > >> test_saImmOiSelectionObjectGet.c \ > >> test_saImmOiDispatch.c \ > >> @@ -52,7 +49,9 @@ immoitest_SOURCES = \ > >> immoitest_LDADD = \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> - $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> + $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la \ > >> + $(top_builddir)/tests/immsv/common/libimmtest.la > >> > >> > >> immapplier_CPPFLAGS = \ > >> @@ -61,11 +60,10 @@ immapplier_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> immapplier_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> applier.c > >> > >> immapplier_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> - > >> diff --git a/tests/immsv/management/Makefile.am > >> b/tests/immsv/management/Makefile.am > >> --- a/tests/immsv/management/Makefile.am > >> +++ b/tests/immsv/management/Makefile.am > >> @@ -26,9 +26,6 @@ immomtest_CPPFLAGS = \ > >> -I$(top_srcdir)/tests/unit_test_fw/inc > >> > >> immomtest_SOURCES = \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/tests/immsv/common/immtest.c \ > >> test_saImmOmInitialize.c \ > >> test_saImmOmSelectionObjectGet.c \ > >> test_saImmOmDispatch.c \ > >> @@ -61,7 +58,9 @@ immomtest_SOURCES = \ > >> immomtest_LDADD = \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> - $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> + $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la \ > >> + $(top_builddir)/tests/immsv/common/libimmtest.la > >> > >> > >> immpopulate_CPPFLAGS = \ > >> @@ -70,12 +69,10 @@ immpopulate_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> immpopulate_SOURCES = \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> populate.c > >> > >> immpopulate_LDADD = \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> - > >> - > >> diff --git a/tests/logsv/Makefile.am b/tests/logsv/Makefile.am > >> --- a/tests/logsv/Makefile.am > >> +++ b/tests/logsv/Makefile.am > >> @@ -29,9 +29,6 @@ logtest_CPPFLAGS = \ > >> -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> logtest_SOURCES = \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> logtest.c \ > >> tet_saLogInitialize.c \ > >> tet_saLogSelectionObjectGet.c \ > >> @@ -49,6 +46,8 @@ logtest_SOURCES = \ > >> tet_LogOiOps.c > >> > >> logtest_LDADD = \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/saf/libSaLog/libSaLog.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> @@ -58,6 +57,7 @@ saflogtest_SOURCES = \ > >> saflogtest.c > >> > >> saflogtest_LDADD = \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/saf/libSaLog/libSaLog.la \ > >> $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> - > >> diff --git a/tests/mds/Makefile.am b/tests/mds/Makefile.am > >> --- a/tests/mds/Makefile.am > >> +++ b/tests/mds/Makefile.am > >> @@ -31,14 +31,13 @@ mdstest_CPPFLAGS = \ > >> -I$(top_srcdir)/tests/unit_test_fw/inc > >> > >> mdstest_SOURCES = \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/osaf/tools/safimm/src/immutil.c \ > >> mdstest.c \ > >> mdstipc_api.c \ > >> mdstipc_conf.c > >> > >> mdstest_LDADD = \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la \ > >> + $(top_builddir)/osaf/tools/safimm/src/libimmutil.la \ > >> $(top_builddir)/osaf/libs/saf/libSaLog/libSaLog.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> diff --git a/tests/ntfsv/Makefile.am b/tests/ntfsv/Makefile.am > >> --- a/tests/ntfsv/Makefile.am > >> +++ b/tests/ntfsv/Makefile.am > >> @@ -33,9 +33,6 @@ ntftest_CPPFLAGS = \ > >> -I$(top_srcdir)/tests/unit_test_fw/inc > >> > >> ntftest_SOURCES = \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/osaf/libs/core/common/logtrace.c \ > >> tet_ntf_main.c \ > >> sa_error.c \ > >> tet_ntf_common.c \ > >> @@ -69,15 +66,18 @@ ntftest_SOURCES = \ > >> tet_saNtfPtrValGet.c \ > >> test_ntfFilterVerification.c > >> > >> +ntftest_LDADD = \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la > >> + > >> if ENABLE_NTFIMCN > >> > >> ntftest_SOURCES += test_ntf_imcn.c > >> -ntftest_SOURCES += $(top_srcdir)/osaf/tools/safimm/src/immutil.c > >> +ntftest_LDADD += > $(top_builddir)/osaf/tools/safimm/src/libimmutil.la > >> ntftest_CPPFLAGS += > -I$(top_srcdir)/osaf/libs/common/immsv/include > >> > >> endif > >> > >> -ntftest_LDADD = \ > >> +ntftest_LDADD += \ > >> $(top_builddir)/osaf/libs/saf/libSaNtf/libSaNtf.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \ > >> $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la \ > >> diff --git a/tests/plmsv/Makefile.am b/tests/plmsv/Makefile.am > >> --- a/tests/plmsv/Makefile.am > >> +++ b/tests/plmsv/Makefile.am > >> @@ -18,4 +18,4 @@ include $(top_srcdir)/Makefile.common > >> > >> MAINTAINERCLEANFILES = Makefile.in > >> > >> -SUBDIRS = plms > >> +SUBDIRS = common plms > >> diff --git a/tests/plmsv/common/Makefile.am > >> b/tests/plmsv/common/Makefile.am > >> new file mode 100644 > >> --- /dev/null > >> +++ b/tests/plmsv/common/Makefile.am > >> @@ -0,0 +1,27 @@ > >> +# -*- OpenSAF -*- > >> +# > >> +# (C) Copyright 2014 The OpenSAF Foundation > >> +# > >> +# This program is distributed in the hope that it will be useful, > >> but > >> +# WITHOUT ANY WARRANTY; without even the implied warranty of > >> MERCHANTABILITY > >> +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > >> licensed > >> +# under the GNU Lesser General Public License Version 2.1, > February > >> 1999. > >> +# The complete license can be accessed from the following > location: > >> +# http://opensource.org/licenses/lgpl-license.php > >> +# See the Copying file included with the OpenSAF distribution for > >> full > >> +# licensing terms. > >> +# > >> +# Author(s): Ericsson AB > >> +# > >> + > >> +include $(top_srcdir)/Makefile.common > >> + > >> +MAINTAINERCLEANFILES = Makefile.in > >> + > >> +noinst_LTLIBRARIES = libplmtest.la > >> + > >> +libplmtest_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) > >> + > >> +libplmtest_la_SOURCES = \ > >> + plmtest.c > >> diff --git a/tests/plmsv/plms/Makefile.am > >> b/tests/plmsv/plms/Makefile.am > >> --- a/tests/plmsv/plms/Makefile.am > >> +++ b/tests/plmsv/plms/Makefile.am > >> @@ -10,9 +10,6 @@ plmtest_CPPFLAGS = \ > >> -I$(top_srcdir)/tests/unit_test_fw/inc > >> > >> plmtest_SOURCES = \ > >> - $(top_srcdir)/tests/unit_test_fw/src/utest.c \ > >> - $(top_srcdir)/tests/unit_test_fw/src/util.c \ > >> - $(top_srcdir)/tests/plmsv/common/plmtest.c \ > >> test_saPlmInitialize.c \ > >> test_saPlmSelectionObjectGet.c \ > >> test_saPlmDispatch.c \ > >> @@ -25,4 +22,6 @@ plmtest_SOURCES = \ > >> > >> plmtest_LDADD = \ > >> $(top_builddir)/osaf/libs/saf/libSaPlm/libSaPlm.la \ > >> - $(top_builddir)/osaf/libs/core/libopensaf_core.la > >> + $(top_builddir)/osaf/libs/core/libopensaf_core.la \ > >> + $(top_builddir)/tests/unit_test_fw/src/libutest.la \ > >> + $(top_builddir)/tests/plmsv/common/libplmtest.la > >> diff --git a/tests/unit_test_fw/Makefile.am > >> b/tests/unit_test_fw/Makefile.am > >> --- a/tests/unit_test_fw/Makefile.am > >> +++ b/tests/unit_test_fw/Makefile.am > >> @@ -18,4 +18,4 @@ include $(top_srcdir)/Makefile.common > >> > >> MAINTAINERCLEANFILES = Makefile.in > >> > >> -SUBDIRS = inc > >> +SUBDIRS = inc src > >> diff --git a/tests/unit_test_fw/inc/util.h > >> b/tests/unit_test_fw/inc/util.h > >> --- a/tests/unit_test_fw/inc/util.h > >> +++ b/tests/unit_test_fw/inc/util.h > >> @@ -19,7 +19,6 @@ > >> #ifndef util_h > >> #define util_h > >> > >> -extern const char *saf_error[]; > >> extern SaTimeT getSaTimeT(void); > >> extern void create_dn(char *rdn, char *parent, SaNameT *dn); > >> extern void sa_namet_init(char *value, SaNameT *namet); > >> diff --git a/tests/unit_test_fw/src/Makefile.am > >> b/tests/unit_test_fw/src/Makefile.am > >> new file mode 100644 > >> --- /dev/null > >> +++ b/tests/unit_test_fw/src/Makefile.am > >> @@ -0,0 +1,30 @@ > >> +# -*- OpenSAF -*- > >> +# > >> +# (C) Copyright 2014 The OpenSAF Foundation > >> +# > >> +# This program is distributed in the hope that it will be useful, > >> but > >> +# WITHOUT ANY WARRANTY; without even the implied warranty of > >> MERCHANTABILITY > >> +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > >> licensed > >> +# under the GNU Lesser General Public License Version 2.1, > February > >> 1999. > >> +# The complete license can be accessed from the following > location: > >> +# http://opensource.org/licenses/lgpl-license.php > >> +# See the Copying file included with the OpenSAF distribution for > >> full > >> +# licensing terms. > >> +# > >> +# Author(s): Ericsson AB > >> +# > >> + > >> +include $(top_srcdir)/Makefile.common > >> + > >> +MAINTAINERCLEANFILES = Makefile.in > >> + > >> +noinst_LTLIBRARIES = libutest.la > >> + > >> +libutest_la_CPPFLAGS = \ > >> + $(AM_CPPFLAGS) \ > >> + -I$(top_srcdir)/tests/unit_test_fw/inc \ > >> + -I$(top_srcdir)/osaf/libs/saf/include > >> + > >> +libutest_la_SOURCES = \ > >> + utest.c \ > >> + util.c > >> diff --git a/tests/unit_test_fw/src/util.c > >> b/tests/unit_test_fw/src/util.c > >> --- a/tests/unit_test_fw/src/util.c > >> +++ b/tests/unit_test_fw/src/util.c > >> @@ -23,7 +23,7 @@ > >> #include <assert.h> > >> #include <saAis.h> > >> > >> -const char *saf_error[] = > >> +static const char *saf_error[] = > >> { > >> "SA_AIS_NOT_VALID", > >> "SA_AIS_OK", ------------------------------------------------------------------------------ HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions Find What Matters Most in Your Big Data with HPCC Systems Open Source. Fast. Scalable. Simple. Ideal for Dirty Data. Leverages Graph Analysis for Fast Processing & Easy Data Exploration http://p.sf.net/sfu/hpccsystems _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
