summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACEXML/apps/svcconf/Makefile.am10
-rw-r--r--ACEXML/common/Makefile.am8
-rw-r--r--ACEXML/examples/SAXPrint/Makefile.am10
-rw-r--r--ACEXML/parser/parser/Makefile.am11
-rw-r--r--ACEXML/tests/Makefile.am37
-rw-r--r--ChangeLog20
-rw-r--r--Makefile.am4
-rw-r--r--ace/RMCast/Makefile.am11
-rw-r--r--ace/SSL/Makefile.am11
-rw-r--r--apps/gperf/Makefile.am5
-rw-r--r--apps/gperf/src/Makefile.am10
-rw-r--r--apps/gperf/tests/Makefile.am71
-rw-r--r--configure.ac11
-rw-r--r--netsvcs/servers/Makefile.am9
-rw-r--r--protocols/ace/RMCast/Makefile.am11
-rw-r--r--tests/Makefile.am5
-rw-r--r--tests/SSL/Makefile.am10
17 files changed, 155 insertions, 99 deletions
diff --git a/ACEXML/apps/svcconf/Makefile.am b/ACEXML/apps/svcconf/Makefile.am
index 7b370a2428d..d44709aa4d4 100644
--- a/ACEXML/apps/svcconf/Makefile.am
+++ b/ACEXML/apps/svcconf/Makefile.am
@@ -9,14 +9,14 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
## Makefile.ACEXML_XML_Svc_Conf_Parser.am
noinst_LTLIBRARIES = libACEXML_XML_Svc_Conf_Parser.la
libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/ACEXML/common
libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
@@ -24,7 +24,9 @@ libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
Svcconf_Handler.cpp
libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \
- $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
noinst_HEADERS = \
Svcconf.h \
diff --git a/ACEXML/common/Makefile.am b/ACEXML/common/Makefile.am
index 5e48ba604dd..6030b32ef26 100644
--- a/ACEXML/common/Makefile.am
+++ b/ACEXML/common/Makefile.am
@@ -8,13 +8,15 @@
## MPC Command:
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
+
## Makefile.ACEXML.am
noinst_LTLIBRARIES = libACEXML.la
libACEXML_la_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-DACEXML_BUILD_DLL
libACEXML_la_SOURCES = \
diff --git a/ACEXML/examples/SAXPrint/Makefile.am b/ACEXML/examples/SAXPrint/Makefile.am
index b2291d42fd7..6228ef3905f 100644
--- a/ACEXML/examples/SAXPrint/Makefile.am
+++ b/ACEXML/examples/SAXPrint/Makefile.am
@@ -9,14 +9,14 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
## Makefile.SAXPrint.am
noinst_PROGRAMS = SAXPrint
SAXPrint_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/ACEXML/common
SAXPrint_SOURCES = \
@@ -29,7 +29,9 @@ SAXPrint_SOURCES = \
SAXPrint_Handler.i
SAXPrint_LDADD = \
- $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
## Clean up template repositories, etc.
clean-local:
diff --git a/ACEXML/parser/parser/Makefile.am b/ACEXML/parser/parser/Makefile.am
index 6a5a68f67cd..8cb7a76f7cd 100644
--- a/ACEXML/parser/parser/Makefile.am
+++ b/ACEXML/parser/parser/Makefile.am
@@ -8,13 +8,15 @@
## MPC Command:
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
+
## Makefile.ACEXML_Parser.am
noinst_LTLIBRARIES = libACEXML_Parser.la
libACEXML_Parser_la_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-DACEXML_PARSER_BUILD_DLL
libACEXML_Parser_la_SOURCES = \
@@ -24,7 +26,8 @@ libACEXML_Parser_la_SOURCES = \
ParserInternals.cpp
libACEXML_Parser_la_LIBADD = \
- $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
noinst_HEADERS = \
Entity_Manager.h \
diff --git a/ACEXML/tests/Makefile.am b/ACEXML/tests/Makefile.am
index 14b3f6a899d..756d1d84fc2 100644
--- a/ACEXML/tests/Makefile.am
+++ b/ACEXML/tests/Makefile.am
@@ -9,66 +9,71 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
## Makefile.ContentHandler_Test.am
noinst_PROGRAMS = ContentHandler_Test
ContentHandler_Test_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/ACEXML/common
ContentHandler_Test_SOURCES = \
ContentHandler_Test.cpp
ContentHandler_Test_LDADD = \
- $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.HttpCharStream_Test.am
noinst_PROGRAMS += HttpCharStream_Test
HttpCharStream_Test_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/ACEXML/common
HttpCharStream_Test_SOURCES = \
HttpCharStream_Test.cpp
HttpCharStream_Test_LDADD = \
- $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.NamespaceSupport_Test.am
noinst_PROGRAMS += NamespaceSupport_Test
NamespaceSupport_Test_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/ACEXML/common
NamespaceSupport_Test_SOURCES = \
NamespaceSupport_Test.cpp
NamespaceSupport_Test_LDADD = \
- $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.Transcoder_Test.am
noinst_PROGRAMS += Transcoder_Test
Transcoder_Test_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/ACEXML/common
Transcoder_Test_SOURCES = \
Transcoder_Test.cpp
Transcoder_Test_LDADD = \
- $(top_builddir)/ACEXML/parser/parser/libACEXML_Parser.la $(top_builddir)/ACEXML/libACEXML.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
## Clean up template repositories, etc.
clean-local:
diff --git a/ChangeLog b/ChangeLog
index 8a98b59f9f1..48b21a1f0eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Tue Sep 28 14:31:10 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ACEXML/apps/svcconf/Makefile.am:
+ * ACEXML/common/Makefile.am:
+ * ACEXML/examples/SAXPrint/Makefile.am:
+ * ACEXML/parser/parser/Makefile.am:
+ * ACEXML/tests/Makefile.am:
+ * Makefile.am:
+ * ace/RMCast/Makefile.am:
+ * ace/SSL/Makefile.am:
+ * apps/gperf/Makefile.am:
+ * apps/gperf/src/Makefile.am:
+ * apps/gperf/tests/Makefile.am:
+ * configure.ac:
+ * netsvcs/servers/Makefile.am:
+ * tests/Makefile.am:
+ * tests/SSL/Makefile.am:
+
+ Update so things successfully build when srcdir != builddir.
+
Tue Sep 28 12:48:37 2004 Chad Elliott <elliott_c@ociweb.com>
* include/makeinclude/wrapper_macros.GNU:
diff --git a/Makefile.am b/Makefile.am
index 29f7411f84e..386847fb788 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,11 @@ SUBDIRS = \
## ASNMP \
## websvcs
+man_MANS = ace-config.1
+
+bin_SCRIPTS = ace-config
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am
index 8414b186fd8..cb9f30c53c6 100644
--- a/ace/RMCast/Makefile.am
+++ b/ace/RMCast/Makefile.am
@@ -8,17 +8,20 @@
## MPC Command:
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
+
nobase_include_HEADERS =
lib_LTLIBRARIES =
+
## Makefile.RMCast.am
if BUILD_RMCAST
lib_LTLIBRARIES += libACE_RMCast.la
libACE_RMCast_la_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-DACE_RMCAST_BUILD_DLL
libACE_RMCast_la_SOURCES = \
@@ -49,7 +52,7 @@ libACE_RMCast_la_SOURCES = \
RMCast_Worker.cpp
libACE_RMCast_la_LIBADD = \
- $(top_srcdir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
nobase_include_HEADERS += \
RMCast.h \
diff --git a/ace/SSL/Makefile.am b/ace/SSL/Makefile.am
index 21c310a8f73..b8a3c38a730 100644
--- a/ace/SSL/Makefile.am
+++ b/ace/SSL/Makefile.am
@@ -8,17 +8,20 @@
## MPC Command:
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
+
nobase_include_HEADERS =
lib_LTLIBRARIES =
+
## Makefile.SSL.am
if BUILD_SSL
lib_LTLIBRARIES += libACE_SSL.la
libACE_SSL_la_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-DACE_SSL_BUILD_DLL
libACE_SSL_la_SOURCES = \
@@ -31,7 +34,7 @@ libACE_SSL_la_SOURCES = \
SSL_SOCK_Stream.cpp
libACE_SSL_la_LIBADD = \
- $(top_srcdir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
nobase_include_HEADERS += \
SSL_Asynch_BIO.h \
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
index 337a136e42e..b79114704a3 100644
--- a/apps/gperf/Makefile.am
+++ b/apps/gperf/Makefile.am
@@ -9,6 +9,7 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
SUBDIRS = \
- src \
- tests
+ src
+
+# tests
diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am
index 614c1367f0c..a028ba6dddb 100644
--- a/apps/gperf/src/Makefile.am
+++ b/apps/gperf/src/Makefile.am
@@ -8,13 +8,15 @@
## MPC Command:
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
+
## Makefile.gperf.am
bin_PROGRAMS = gperf
gperf_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
gperf_SOURCES = \
Bool_Array.cpp \
@@ -37,7 +39,7 @@ gperf_SOURCES = \
Vectors.h
gperf_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Clean up template repositories, etc.
clean-local:
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index b42771d508f..18b54bf992e 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -9,6 +9,7 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
## Makefile.adainset.am
@@ -28,16 +29,15 @@ ada-stamp: $(srcdir)/ada.gperf
noinst_PROGRAMS = aout
aout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
aout_SOURCES = \
ada.cpp \
test.cpp
aout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.cinset.am
@@ -57,16 +57,15 @@ c-stamp: $(srcdir)/c.gperf
noinst_PROGRAMS += cout
cout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
cout_SOURCES = \
c.cpp \
test.cpp
cout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.cppinset.am
@@ -86,16 +85,15 @@ cpp-stamp: $(srcdir)/cpp.gperf
noinst_PROGRAMS += cppout
cppout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
cppout_SOURCES = \
cpp.cpp \
test.cpp
cppout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.iinset.am
@@ -115,16 +113,15 @@ idl-stamp: $(srcdir)/idl.gperf
noinst_PROGRAMS += iout
iout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
iout_SOURCES = \
idl.cpp \
test.cpp
iout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.iinset2.am
@@ -144,16 +141,15 @@ idl-stamp: $(srcdir)/idl.gperf
noinst_PROGRAMS += iout2
iout2_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
iout2_SOURCES = \
idl.cpp \
test.cpp
iout2_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.m3inset.am
@@ -173,16 +169,15 @@ modula3-stamp: $(srcdir)/modula3.gperf
noinst_PROGRAMS += m3out
m3out_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
m3out_SOURCES = \
modula3.cpp \
test.cpp
m3out_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.pinset.am
@@ -202,16 +197,15 @@ pascal-stamp: $(srcdir)/pascal.gperf
noinst_PROGRAMS += pout
pout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
pout_SOURCES = \
pascal.cpp \
test.cpp
pout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.preinset.am
@@ -231,16 +225,15 @@ adadefs-stamp: $(srcdir)/adadefs.gperf
noinst_PROGRAMS += preout
preout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
preout_SOURCES = \
adadefs.cpp \
test.cpp
preout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.taoinset.am
@@ -260,16 +253,15 @@ tao-stamp: $(srcdir)/tao.gperf
noinst_PROGRAMS += taoout
taoout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
taoout_SOURCES = \
tao.cpp \
test.cpp
taoout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Makefile.tinset.am
@@ -289,16 +281,15 @@ corba-stamp: $(srcdir)/corba.gperf
noinst_PROGRAMS += tout
tout_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR)
tout_SOURCES = \
corba.cpp \
test.cpp
tout_LDADD = \
- $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
## Clean up template repositories, etc.
clean-local:
diff --git a/configure.ac b/configure.ac
index 2a8b3dd57f3..8b33eeb4bd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7211,6 +7211,7 @@ AC_CONFIG_FILES([
ace/RMCast/Makefile
ace/QoS/Makefile
ace/SSL/Makefile
+ ace/TMCast/Makefile
apps/Makefile
apps/gperf/Makefile
apps/gperf/src/Makefile
@@ -7230,7 +7231,17 @@ AC_CONFIG_FILES([
netsvcs/clients/Tokens/rw_lock/Makefile
netsvcs/servers/Makefile
tests/Makefile
+ tests/RMCast/Makefile
tests/SSL/Makefile
+ ACEXML/Makefile
+ ACEXML/apps/Makefile
+ ACEXML/apps/svcconf/Makefile
+ ACEXML/common/Makefile
+ ACEXML/examples/Makefile
+ ACEXML/examples/SAXPrint/Makefile
+ ACEXML/parser/Makefile
+ ACEXML/parser/parser/Makefile
+ ACEXML/tests/Makefile
])
dnl Configure subdirectories if they are present.
diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am
index 84f542883c2..f2654748ea4 100644
--- a/netsvcs/servers/Makefile.am
+++ b/netsvcs/servers/Makefile.am
@@ -9,21 +9,22 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
## Makefile.Netsvcs_server.am
noinst_PROGRAMS = main
main_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-I$(ACE_ROOT)/netsvcs/lib
main_SOURCES = \
main.cpp
main_LDADD = \
- $(top_builddir)/lib/libnetsvcs.la $(top_builddir)/lib/libACE.la
+ $(ACE_BUILDDIR)/netsvcs/lib/libnetsvcs.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
## Clean up template repositories, etc.
clean-local:
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index 8414b186fd8..cb9f30c53c6 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -8,17 +8,20 @@
## MPC Command:
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
+
nobase_include_HEADERS =
lib_LTLIBRARIES =
+
## Makefile.RMCast.am
if BUILD_RMCAST
lib_LTLIBRARIES += libACE_RMCast.la
libACE_RMCast_la_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-DACE_RMCAST_BUILD_DLL
libACE_RMCast_la_SOURCES = \
@@ -49,7 +52,7 @@ libACE_RMCast_la_SOURCES = \
RMCast_Worker.cpp
libACE_RMCast_la_LIBADD = \
- $(top_srcdir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/libACE.la
nobase_include_HEADERS += \
RMCast.h \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f4afcced03f..7d41a58f59e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,8 +12,9 @@ ACE_ROOT = $(top_srcdir)
SUBDIRS = \
. \
- RMCast \
- SSL
+ RMCast
+
+# SSL
noinst_PROGRAMS =
## Makefile.Test_Output.am
diff --git a/tests/SSL/Makefile.am b/tests/SSL/Makefile.am
index 6edab5651d2..dbc05731f54 100644
--- a/tests/SSL/Makefile.am
+++ b/tests/SSL/Makefile.am
@@ -9,6 +9,7 @@
## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
ACE_ROOT = $(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
noinst_PROGRAMS =
## Makefile.Thread_Pool_Reactor_SSL_Test.am
@@ -17,9 +18,8 @@ if BUILD_SSL
noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test
Thread_Pool_Reactor_SSL_Test_CPPFLAGS = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir) \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
-DACE_HAS_SSL=1
Thread_Pool_Reactor_SSL_Test_SOURCES = \
@@ -28,7 +28,9 @@ Thread_Pool_Reactor_SSL_Test_SOURCES = \
Thread_Pool_Reactor_SSL_Test.h
Thread_Pool_Reactor_SSL_Test_LDADD = \
- $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la
+ $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
+ $(ACE_BUILDDIR)/tests/libTest_Output.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
endif BUILD_SSL
View Lorry Controller Status