[devel] [PATCH 1 of 1] build: Modernize autotools configuration [#901]
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], [opensaf-devel@lists.sourceforge.net]) +AC_INIT([opensaf], [4.5.M0], [opensaf-us...@lists.sourceforge.net], [opensaf]) AC
Re: [devel] [PATCH 1 of 1] build: Modernize autotools configuration [#901]
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. - anders.wid...@ericsson.com 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 n
Re: [devel] [PATCH 1 of 1] build: Modernize autotools configuration [#901]
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. > > - anders.wid...@ericsson.com 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
Re: [devel] [PATCH 1 of 1] build: Modernize autotools configuration [#901]
If possible, please send or upload to the ticket, the warning or error that you get after making this change. - Mathi. - anders.wid...@ericsson.com 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. > > > > - anders.wid...@ericsson.com 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
Re: [devel] [PATCH 1 of 1] build: Modernize autotools configuration [#901]
Well, if I do exactly the change you suggested below, then I still get this warning: configure.ac:25: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: configure.ac:25: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation This is because you changed AM_INIT_AUTOMAKE invocation from two arguments to three agruments, both of which are deprecated. But if I set the subdir-objects in the new form, then I get no warning while running automake. However, when building I get this error (not a mere warning; build actually fails): Makefile:687: ../../../../../osaf/tools/safimm/src/.deps/osafamfd-immutil.Po: No such file or directory Makefile:688: ../../../../../osaf/tools/saflog/src/.deps/osafamfd-saflog.Po: No such file or directory make[6]: *** No rule to make target `../../../../../osaf/tools/saflog/src/.deps/osafamfd-saflog.Po'. Stop. I will add the above messages to the ticket. / Anders Widell On 06/13/2014 12:47 PM, Mathivanan Naickan Palanivelu wrote: > If possible, please send or upload to the ticket, the warning or error that > you get > after making this change. > > - Mathi. > > - anders.wid...@ericsson.com 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. >>> >>> - anders.wid...@ericsson.com 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
