ChangeLogTag: Sun Mar 6 20:21:54 2005 J.T. Conklin <jtc@acorntoolworks.com>

1 files changed, 25 insertions, 26 deletions

diff --git a/ace/Makefile.am b/ace/Makefile.am
index 8dae7dfdc32..dbe4efa50ca 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -2,14 +2,9 @@
 ##
 ## $Id$
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
 includedir = @includedir@/ace
-pkgconfigdatadir = @libdir@/pkgconfig
+pkgconfigdir = @libdir@/pkgconfig
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -21,9 +16,10 @@ SUBDIRS = \
 
 CLEANFILES =
 BUILT_SOURCES =
-pkgconfigdata_DATA =
+pkgconfig_DATA =
 lib_LTLIBRARIES =
-## Makefile.ACE.am 
+
+## Makefile.ACE.am
 
 lib_LTLIBRARIES += libACE.la
 
@@ -76,6 +72,7 @@ libACE_la_SOURCES = \
   Container_Instantiations.cpp \
   Containers.cpp \
   Copy_Disabled.cpp \
+  Countdown_Time.cpp \
   DEV.cpp \
   DEV_Addr.cpp \
   DEV_Connector.cpp \
@@ -325,7 +322,7 @@ libACE_la_SOURCES = \
   gethrtime.cpp
 
 libACE_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 nobase_include_HEADERS = \
   ACE.h \
@@ -443,6 +440,7 @@ nobase_include_HEADERS = \
   Containers_T.h \
   Containers_T.inl \
   Copy_Disabled.h \
+  Countdown_Time.h \
   DEV.h \
   DEV.inl \
   DEV_Addr.h \
@@ -1168,7 +1166,7 @@ nobase_include_HEADERS = \
   streams.h \
   svc_export.h
 
-pkgconfigdata_DATA += ACE.pc
+pkgconfig_DATA += ACE.pc
 
 ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in
@@ -1178,7 +1176,7 @@ EXTRA_DIST = \
   ace.rc
 
 
-## Makefile.ACE_FlReactor.am 
+## Makefile.ACE_FlReactor.am
 
 if BUILD_FL
 if BUILD_GL
@@ -1195,16 +1193,16 @@ libACE_FlReactor_la_SOURCES = \
   FlReactor.cpp
 
 libACE_FlReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 libACE_FlReactor_la_LIBADD = \
- libACE.la
+  libACE.la
 
 nobase_include_HEADERS += \
   ACE_FlReactor_export.h \
   FlReactor.h
 
-pkgconfigdata_DATA += ACE_FlReactor.pc
+pkgconfig_DATA += ACE_FlReactor.pc
 
 ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_FlReactor.pc.in
@@ -1217,7 +1215,7 @@ EXTRA_DIST += \
   ACE_FlReactor.pc.in
 
 
-## Makefile.ACE_QtReactor.am 
+## Makefile.ACE_QtReactor.am
 
 if BUILD_QT
 
@@ -1244,16 +1242,17 @@ libACE_QtReactor_la_SOURCES = \
   QtReactor_moc.cpp
 
 libACE_QtReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 libACE_QtReactor_la_LIBADD = \
- libACE.la -lqt-mt
+  libACE.la \
+  -lqt-mt
 
 nobase_include_HEADERS += \
   ACE_QtReactor_export.h \
   QtReactor.h
 
-pkgconfigdata_DATA += ACE_QtReactor.pc
+pkgconfig_DATA += ACE_QtReactor.pc
 
 ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_QtReactor.pc.in
@@ -1264,7 +1263,7 @@ EXTRA_DIST += \
   ACE_QtReactor.pc.in
 
 
-## Makefile.ACE_TkReactor.am 
+## Makefile.ACE_TkReactor.am
 
 if BUILD_TK
 
@@ -1279,16 +1278,16 @@ libACE_TkReactor_la_SOURCES = \
   TkReactor.cpp
 
 libACE_TkReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 libACE_TkReactor_la_LIBADD = \
- libACE.la
+  libACE.la
 
 nobase_include_HEADERS += \
   ACE_TkReactor_export.h \
   TkReactor.h
 
-pkgconfigdata_DATA += ACE_TkReactor.pc
+pkgconfig_DATA += ACE_TkReactor.pc
 
 ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_TkReactor.pc.in
@@ -1299,7 +1298,7 @@ EXTRA_DIST += \
   ACE_TkReactor.pc.in
 
 
-## Makefile.ACE_XtReactor.am 
+## Makefile.ACE_XtReactor.am
 
 if BUILD_X11
 if BUILD_XT
@@ -1315,16 +1314,16 @@ libACE_XtReactor_la_SOURCES = \
   XtReactor.cpp
 
 libACE_XtReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
 libACE_XtReactor_la_LIBADD = \
- libACE.la
+  libACE.la
 
 nobase_include_HEADERS += \
   ACE_XtReactor_export.h \
   XtReactor.h
 
-pkgconfigdata_DATA += ACE_XtReactor.pc
+pkgconfig_DATA += ACE_XtReactor.pc
 
 ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_XtReactor.pc.in