diff options
Diffstat (limited to 'ace/Makefile.am')
| -rw-r--r-- | ace/Makefile.am | 117 |
1 files changed, 32 insertions, 85 deletions
diff --git a/ace/Makefile.am b/ace/Makefile.am index 93728f9e355..1a418763551 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -2,11 +2,6 @@ ## ## $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 -type automake -noreldefs ACE.mwc includedir = @includedir@/ace pkgconfigdir = @libdir@/pkgconfig @@ -20,16 +15,10 @@ SUBDIRS = \ QoS \ SSL -CLEANFILES = -lib_LTLIBRARIES = -nobase_include_HEADERS = -pkgconfig_DATA = ## Makefile.ACE.am -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES += libACE.la +lib_LTLIBRARIES = libACE.la libACE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -42,7 +31,6 @@ libACE_la_SOURCES = \ ACE.cpp \ ACE_crc32.cpp \ ACE_crc_ccitt.cpp \ - ARGV.cpp \ ATM_Acceptor.cpp \ ATM_Addr.cpp \ ATM_Connector.cpp \ @@ -54,7 +42,6 @@ libACE_la_SOURCES = \ Addr.cpp \ Arg_Shifter.cpp \ Argv_Type_Converter.cpp \ - Assert.cpp \ Asynch_IO.cpp \ Asynch_IO_Impl.cpp \ Asynch_Pseudo_Task.cpp \ @@ -66,8 +53,8 @@ libACE_la_SOURCES = \ Basic_Stats.cpp \ Basic_Types.cpp \ CDR_Base.cpp \ - CDR_Size.cpp \ CDR_Stream.cpp \ + CDR_Size.cpp \ Capabilities.cpp \ Cleanup.cpp \ Codecs.cpp \ @@ -96,8 +83,6 @@ libACE_la_SOURCES = \ Dump.cpp \ Dynamic.cpp \ Dynamic_Service_Base.cpp \ - Encoding_Converter.cpp \ - Encoding_Converter_Factory.cpp \ Event.cpp \ Event_Handler.cpp \ FIFO.cpp \ @@ -118,6 +103,7 @@ libACE_la_SOURCES = \ Get_Opt.cpp \ Handle_Ops.cpp \ Handle_Set.cpp \ + Hash_Map_Manager.cpp \ Hashable.cpp \ High_Res_Timer.cpp \ ICMP_Socket.cpp \ @@ -289,7 +275,8 @@ libACE_la_SOURCES = \ Sock_Connect.cpp \ Stats.cpp \ String_Base_Const.cpp \ - Svc_Conf_Lexer.cpp \ + Svc_Conf_Lexer_Guard.cpp \ + Svc_Conf_l.cpp \ Svc_Conf_y.cpp \ Synch_Options.cpp \ System_Time.cpp \ @@ -327,9 +314,6 @@ libACE_la_SOURCES = \ UPIPE_Acceptor.cpp \ UPIPE_Connector.cpp \ UPIPE_Stream.cpp \ - UTF16_Encoding_Converter.cpp \ - UTF32_Encoding_Converter.cpp \ - UTF8_Encoding_Converter.cpp \ UUID.cpp \ WFMO_Reactor.cpp \ WIN32_Asynch_IO.cpp \ @@ -341,7 +325,7 @@ libACE_la_SOURCES = \ libACE_la_LDFLAGS = \ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ -nobase_include_HEADERS += \ +nobase_include_HEADERS = \ ACE.h \ ACE.inl \ ACE_export.h \ @@ -380,7 +364,6 @@ nobase_include_HEADERS += \ Array_Map.cpp \ Array_Map.h \ Array_Map.inl \ - Assert.h \ Asynch_Acceptor.cpp \ Asynch_Acceptor.h \ Asynch_Connector.cpp \ @@ -421,10 +404,10 @@ nobase_include_HEADERS += \ Bound_Ptr.inl \ CDR_Base.h \ CDR_Base.inl \ - CDR_Size.h \ - CDR_Size.inl \ CDR_Stream.h \ CDR_Stream.inl \ + CDR_Size.h \ + CDR_Size.inl \ CORBA_macros.h \ Cache_Map_Manager_T.cpp \ Cache_Map_Manager_T.h \ @@ -492,8 +475,6 @@ nobase_include_HEADERS += \ Dynamic_Service.h \ Dynamic_Service.inl \ Dynamic_Service_Base.h \ - Encoding_Converter.h \ - Encoding_Converter_Factory.h \ Env_Value_T.cpp \ Env_Value_T.h \ Env_Value_T.inl \ @@ -571,6 +552,7 @@ nobase_include_HEADERS += \ High_Res_Timer.h \ High_Res_Timer.inl \ ICMP_Socket.h \ + ICMP_Socket.inl \ INET_Addr.h \ INET_Addr.inl \ IOStream.h \ @@ -763,6 +745,7 @@ nobase_include_HEADERS += \ OS_NS_sys_uio.h \ OS_NS_sys_uio.inl \ OS_NS_sys_utsname.h \ + OS_NS_sys_utsname.inl \ OS_NS_sys_wait.h \ OS_NS_sys_wait.inl \ OS_NS_time.h \ @@ -843,9 +826,9 @@ nobase_include_HEADERS += \ Recyclable.inl \ Refcountable.h \ Refcountable.inl \ - Refcounted_Auto_Ptr.cpp \ Refcounted_Auto_Ptr.h \ Refcounted_Auto_Ptr.inl \ + Refcounted_Auto_Ptr.cpp \ Registry.h \ Registry_Name_Space.h \ Remote_Name_Space.h \ @@ -917,6 +900,7 @@ nobase_include_HEADERS += \ Service_Config.h \ Service_Config.inl \ Service_Manager.h \ + Service_Manager.inl \ Service_Object.h \ Service_Object.inl \ Service_Repository.h \ @@ -955,7 +939,7 @@ nobase_include_HEADERS += \ String_Base.inl \ String_Base_Const.h \ Svc_Conf.h \ - Svc_Conf_Lexer.h \ + Svc_Conf_Lexer_Guard.h \ Svc_Conf_Tokens.h \ Svc_Handler.cpp \ Svc_Handler.h \ @@ -963,6 +947,7 @@ nobase_include_HEADERS += \ Swap.inl \ Synch.h \ Synch_Options.h \ + Synch_Options.inl \ Synch_T.cpp \ Synch_T.h \ Synch_Traits.h \ @@ -977,6 +962,7 @@ nobase_include_HEADERS += \ TP_Reactor.h \ TP_Reactor.inl \ TSS_Adapter.h \ + TSS_Adapter.inl \ TSS_T.cpp \ TSS_T.h \ TSS_T.inl \ @@ -1043,7 +1029,6 @@ nobase_include_HEADERS += \ Token_Request_Reply.h \ Token_Request_Reply.inl \ Trace.h \ - Truncate.h \ Typed_SV_Message.cpp \ Typed_SV_Message.h \ Typed_SV_Message.inl \ @@ -1059,10 +1044,6 @@ nobase_include_HEADERS += \ UPIPE_Connector.inl \ UPIPE_Stream.h \ UPIPE_Stream.inl \ - UTF16_Encoding_Converter.h \ - UTF16_Encoding_Converter.inl \ - UTF32_Encoding_Converter.h \ - UTF8_Encoding_Converter.h \ UUID.h \ UUID.inl \ Unbounded_Queue.cpp \ @@ -1076,7 +1057,6 @@ nobase_include_HEADERS += \ Vector_T.h \ Vector_T.inl \ Version.h \ - Versioned_Namespace.h \ WFMO_Reactor.h \ WFMO_Reactor.inl \ WIN32_Asynch_IO.h \ @@ -1090,7 +1070,6 @@ nobase_include_HEADERS += \ config-all.h \ config-borland-common.h \ config-lite.h \ - config-macros.h \ config-minimal.h \ config-win32-borland.h \ config-win32-common.h \ @@ -1180,7 +1159,6 @@ nobase_include_HEADERS += \ os_include/sys/os_socket.h \ os_include/sys/os_stat.h \ os_include/sys/os_statvfs.h \ - os_include/sys/os_sysctl.h \ os_include/sys/os_time.h \ os_include/sys/os_timeb.h \ os_include/sys/os_times.h \ @@ -1194,17 +1172,11 @@ nobase_include_HEADERS += \ streams.h \ svc_export.h -pkgconfig_DATA += \ - ACE.pc - -CLEANFILES += \ - 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 -endif !BUILD_ACE_FOR_TAO - EXTRA_DIST = \ ACE.pc.in \ ace.rc @@ -1221,28 +1193,22 @@ lib_LTLIBRARIES += libACE_FlReactor.la libACE_FlReactor_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) \ -DACE_FLREACTOR_BUILD_DLL libACE_FlReactor_la_SOURCES = \ FlReactor.cpp libACE_FlReactor_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_FLTK_LDFLAGS) + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libACE_FlReactor_la_LIBADD = \ - libACE.la \ - $(ACE_FLTK_LIBS) + libACE.la nobase_include_HEADERS += \ ACE_FlReactor_export.h \ FlReactor.h -pkgconfig_DATA += \ - ACE_FlReactor.pc - -CLEANFILES += \ - 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 @@ -1262,18 +1228,19 @@ if BUILD_QT BUILT_SOURCES = \ QtReactor_moc.cpp -CLEANFILES += \ +CLEANFILES = \ QtReactor_moc.cpp QtReactor_moc.cpp: $(srcdir)/QtReactor.h - $(QTDIR)/bin/moc -o QtReactor_moc.cpp $(srcdir)/QtReactor.h + $(QTDIR)/bin/moc $(srcdir)/QtReactor.h -o QtReactor_moc.cpp lib_LTLIBRARIES += libACE_QtReactor.la libACE_QtReactor_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) \ + -I$(QTDIR)/include \ + -DQT_THREAD_SUPPORT \ -DACE_QTREACTOR_BUILD_DLL libACE_QtReactor_la_SOURCES = \ @@ -1281,21 +1248,17 @@ libACE_QtReactor_la_SOURCES = \ QtReactor_moc.cpp libACE_QtReactor_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_QT_LDFLAGS) + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libACE_QtReactor_la_LIBADD = \ libACE.la \ - $(ACE_QT_LIBS) + -lqt-mt nobase_include_HEADERS += \ ACE_QtReactor_export.h \ QtReactor.h -pkgconfig_DATA += \ - ACE_QtReactor.pc - -CLEANFILES += \ - 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 @@ -1315,30 +1278,22 @@ lib_LTLIBRARIES += libACE_TkReactor.la libACE_TkReactor_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - $(ACE_TK_CPPFLAGS) \ - $(ACE_TCL_CPPFLAGS) \ -DACE_TKREACTOR_BUILD_DLL libACE_TkReactor_la_SOURCES = \ TkReactor.cpp libACE_TkReactor_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libACE_TkReactor_la_LIBADD = \ - libACE.la \ - $(ACE_TK_LIBS) \ - $(ACE_TCL_LIBS) + libACE.la nobase_include_HEADERS += \ ACE_TkReactor_export.h \ TkReactor.h -pkgconfig_DATA += \ - ACE_TkReactor.pc - -CLEANFILES += \ - 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 @@ -1359,30 +1314,22 @@ lib_LTLIBRARIES += libACE_XtReactor.la libACE_XtReactor_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) \ -DACE_XTREACTOR_BUILD_DLL libACE_XtReactor_la_SOURCES = \ XtReactor.cpp libACE_XtReactor_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libACE_XtReactor_la_LIBADD = \ - libACE.la \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) + libACE.la nobase_include_HEADERS += \ ACE_XtReactor_export.h \ XtReactor.h -pkgconfig_DATA += \ - ACE_XtReactor.pc - -CLEANFILES += \ - 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 |