From 3fed8894300371ca59833d5e2171fd69f44baab0 Mon Sep 17 00:00:00 2001 From: storri Date: Fri, 6 Jun 2003 20:04:00 +0000 Subject: Minor cosmetic Makefile changes for new automake macros. Allow netsvcs and man directories to be built --- ChangeLog | 25 ++++++++++++++++++ Makefile.am | 6 ++--- ace/Makefile.am | 2 +- ace/QoS/Makefile.am | 2 +- ace/RMCast/Makefile.am | 2 +- ace/SSL/Makefile.am | 2 +- apps/gperf/src/Makefile.am | 2 +- configure.ac | 21 ++++++++++++--- netsvcs/Makefile.am | 35 ++++++++++++++----------- netsvcs/clients/Logger/Makefile.am | 2 +- netsvcs/clients/Naming/Client/Makefile.am | 2 +- netsvcs/clients/Naming/Dump_Restore/Makefile.am | 2 +- netsvcs/clients/Tokens/collection/Makefile.am | 2 +- netsvcs/clients/Tokens/deadlock/Makefile.am | 2 +- netsvcs/clients/Tokens/invariant/Makefile.am | 2 +- netsvcs/clients/Tokens/manual/Makefile.am | 2 +- netsvcs/clients/Tokens/mutex/Makefile.am | 2 +- netsvcs/clients/Tokens/rw_lock/Makefile.am | 2 +- netsvcs/lib/Makefile.am | 2 +- netsvcs/servers/Makefile.am | 2 +- 20 files changed, 81 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4950b3cbd53..b24627f5f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +Fri Jun 06 14:53:00 2003 Stephen Torri + + * ace/Makefile.am: + * Makefile.am: + * ace/QoS/Makefile.am: + * ace/RMCast/Makefile.am: + * ace/SSL/Makefile.am: + * apps/gperf/src/Makefile.am: + * netsvcs/makefile.am: + * netsvcs/clients/Logger/Makefile.am: + * netsvcs/clients/Naming/Client/Makefile.am: + * netsvcs/clients/Naming/Dump_Restore/Makefile.am: + * netsvcs/clients/Tokens/colleciton/Makefile.am: + * netsvcs/clients/Tokens/deadlock/Makefile.am: + * netsvcs/clients/Tokens/invariant/Makefile.am: + * netsvcs/clients/Tokens/manual/Makefile.am: + * netsvcs/clients/Tokens/mutex/Makefile.am: + * netsvcs/clients/Tokens/rw_lock/Makefile.am: + * netsvcs/lib/Makefile.am: + * configure.ac: + + Added in netsvcs and man directories into the build. Replaced INCLUDES with AM_CPPFLAGS. + The INCLUDES macros is now deprecated. + + Wed Mar 26 08:00:11 2003 Ossama Othman * configure.ac: diff --git a/Makefile.am b/Makefile.am index e6add9fa4d8..ef0e531d38d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,9 +19,9 @@ man_MANS = ace-config.1 SUBDIRS = \ ace \ apps \ - tests -## netsvcs \ -## man + tests \ + netsvcs \ + man ##SUBDIRS = \ ## docs \ diff --git a/ace/Makefile.am b/ace/Makefile.am index d6fb0508198..3e0e49dccba 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -50,7 +50,7 @@ SUBDIRS = \ $(SSL_DIR) -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) # Define any X libraries that ACE needs, if any. ACE_XLIBS = @ACE_XLIBS@ diff --git a/ace/QoS/Makefile.am b/ace/QoS/Makefile.am index 45b79c11eca..3cf8b04a686 100644 --- a/ace/QoS/Makefile.am +++ b/ace/QoS/Makefile.am @@ -8,7 +8,7 @@ ## Process this file with automake to create Makefile.in ## -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libACE_QoS.la diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am index 5a183b2e90b..e9b4577c17a 100644 --- a/ace/RMCast/Makefile.am +++ b/ace/RMCast/Makefile.am @@ -8,7 +8,7 @@ ## Process this file with automake to create Makefile.in ## -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libACE_RMCast.la diff --git a/ace/SSL/Makefile.am b/ace/SSL/Makefile.am index 76dca53c598..5bb6ed0a65c 100644 --- a/ace/SSL/Makefile.am +++ b/ace/SSL/Makefile.am @@ -8,7 +8,7 @@ ## Process this file with automake to create Makefile.in ## -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libACE_SSL.la diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am index 4ceb7b6fab5..f989809530d 100644 --- a/apps/gperf/src/Makefile.am +++ b/apps/gperf/src/Makefile.am @@ -8,7 +8,7 @@ ## Process this file with automake to create Makefile.in ## -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) bin_PROGRAMS = gperf diff --git a/configure.ac b/configure.ac index fd0d579def2..288473b9659 100644 --- a/configure.ac +++ b/configure.ac @@ -7333,10 +7333,6 @@ dnl We can finally create all the files listed here; Makefile is dnl created from Makefile.in, etc. Top-level Makefiles should be dnl created first. -dnl Makefile -dnl ace/Makefile -dnl apps/Makefile -dnl apps/gperf/Makefile dnl apps/gperf/src/Makefile dnl man/Makefile dnl man/man3/Makefile @@ -7369,6 +7365,23 @@ AC_CONFIG_FILES([ apps/Makefile apps/gperf/Makefile apps/gperf/src/Makefile + man/Makefile + man/man3/Makefile + netsvcs/Makefile + netsvcs/clients/Makefile + netsvcs/clients/Logger/Makefile + netsvcs/clients/Naming/Makefile + netsvcs/clients/Naming/Client/Makefile + netsvcs/clients/Naming/Dump_Restore/Makefile + netsvcs/clients/Tokens/Makefile + netsvcs/clients/Tokens/collection/Makefile + netsvcs/clients/Tokens/deadlock/Makefile + netsvcs/clients/Tokens/invariant/Makefile + netsvcs/clients/Tokens/manual/Makefile + netsvcs/clients/Tokens/mutex/Makefile + netsvcs/clients/Tokens/rw_lock/Makefile + netsvcs/lib/Makefile + netsvcs/servers/Makefile tests/Makefile ]) diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am index 72036c408fc..5fe39000a0c 100644 --- a/netsvcs/Makefile.am +++ b/netsvcs/Makefile.am @@ -1,16 +1,21 @@ +SUBDIRS = \ + lib \ + clients \ + servers -!ifndef CFLAGS -CFLAGS=$(ACE_CFLAGS) -!endif - -!ifndef CPPDIR -CPPDIR=. -!endif - -!ifndef LIBFILES -LIBFILES= $(ACE_LIB) -!endif - -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - +# !ifndef CFLAGS +# CFLAGS=$(ACE_CFLAGS) +# !endif +# +# !ifndef CPPDIR +# CPPDIR=. +# !endif +# +# !ifndef LIBFILES +# LIBFILES= $(ACE_LIB) +# !endif +# +# !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> +# !include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +# +# diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am index f8099722c3e..47d22a4b1b6 100644 --- a/netsvcs/clients/Logger/Makefile.am +++ b/netsvcs/clients/Logger/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) ## LDFLAGS = ## Libtool will automatically link against the "proper" library. diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am index b4a397b58d8..ca793be53a7 100644 --- a/netsvcs/clients/Naming/Client/Makefile.am +++ b/netsvcs/clients/Naming/Client/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_LIBRARIES = libClient_Test.a diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am index 85703366ece..41d3647df1f 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_LIBRARIES = \ libDump_Restore.a diff --git a/netsvcs/clients/Tokens/collection/Makefile.am b/netsvcs/clients/Tokens/collection/Makefile.am index 99f4fba0ba7..c138462a1f5 100644 --- a/netsvcs/clients/Tokens/collection/Makefile.am +++ b/netsvcs/clients/Tokens/collection/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_PROGRAMS = \ collection diff --git a/netsvcs/clients/Tokens/deadlock/Makefile.am b/netsvcs/clients/Tokens/deadlock/Makefile.am index 0b50b13195d..9bc8320e82d 100644 --- a/netsvcs/clients/Tokens/deadlock/Makefile.am +++ b/netsvcs/clients/Tokens/deadlock/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_PROGRAMS = \ deadlock_detection_test diff --git a/netsvcs/clients/Tokens/invariant/Makefile.am b/netsvcs/clients/Tokens/invariant/Makefile.am index 7e137109fa2..e8f4dab2b7d 100644 --- a/netsvcs/clients/Tokens/invariant/Makefile.am +++ b/netsvcs/clients/Tokens/invariant/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_PROGRAMS = \ invariant diff --git a/netsvcs/clients/Tokens/manual/Makefile.am b/netsvcs/clients/Tokens/manual/Makefile.am index 7f2b227464e..76adc9d8349 100644 --- a/netsvcs/clients/Tokens/manual/Makefile.am +++ b/netsvcs/clients/Tokens/manual/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_PROGRAMS = \ manual diff --git a/netsvcs/clients/Tokens/mutex/Makefile.am b/netsvcs/clients/Tokens/mutex/Makefile.am index a62805fafb4..f8ea8472298 100644 --- a/netsvcs/clients/Tokens/mutex/Makefile.am +++ b/netsvcs/clients/Tokens/mutex/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_PROGRAMS = \ test_mutex diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile.am b/netsvcs/clients/Tokens/rw_lock/Makefile.am index f95e991bb24..f047d7cc3a0 100644 --- a/netsvcs/clients/Tokens/rw_lock/Makefile.am +++ b/netsvcs/clients/Tokens/rw_lock/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) noinst_PROGRAMS = \ rw_locks diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am index 09d075ee7f0..6c76d5ce7c7 100644 --- a/netsvcs/lib/Makefile.am +++ b/netsvcs/lib/Makefile.am @@ -13,7 +13,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libnetsvcs.la diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am index 5a9dc555fed..315c481fcbf 100644 --- a/netsvcs/servers/Makefile.am +++ b/netsvcs/servers/Makefile.am @@ -12,7 +12,7 @@ ## needed to process this file. AUTOMAKE_OPTIONS = 1.4 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib noinst_PROGRAMS = main -- cgit v1.2.1