diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-24 21:28:22 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-24 21:28:22 +0000 |
| commit | 14af78e527a1024eebd1ef6aa466dd47e3b8218f (patch) | |
| tree | 67bc825915e14207bbff1ef24dbc95fcb1f9cc16 | |
| parent | f59b94f021d4d7bc509d7d38fa7848783b0ffd7d (diff) | |
| download | ATCD-14af78e527a1024eebd1ef6aa466dd47e3b8218f.tar.gz | |
ChangeLogTag: Tue May 24 14:29:14 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.am | 53 |
2 files changed, 28 insertions, 31 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 58aa303fd5b..073f3cf1572 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue May 24 14:29:14 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Makefile.am: + + Regenerated. + Tue May 24 14:15:36 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/RTEvent.mpc: diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index eb2f619b1f1..20a5503da9e 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -8,7 +8,7 @@ ## MPC Command: ## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc -includedir = @includedir@/orbsvcs/orbsvcs +includedir = @includedir@/orbsvcs pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir)/.. @@ -3249,13 +3249,6 @@ RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl @touch $@ -RTEvent = \ - Event_Utilities.cpp \ - RtecDefaultEventDataC.cpp \ - RtecEventChannelAdminC.cpp \ - RtecEventCommC.cpp \ - RtecUDPAdminC.cpp - lib_LTLIBRARIES += libTAO_RTEvent.la libTAO_RTEvent_la_CPPFLAGS = \ @@ -3268,7 +3261,11 @@ libTAO_RTEvent_la_CPPFLAGS = \ -DTAO_RTEVENT_BUILD_DLL libTAO_RTEvent_la_SOURCES = \ - $(RTEvent) + Event_Utilities.cpp \ + RtecDefaultEventDataC.cpp \ + RtecEventChannelAdminC.cpp \ + RtecEventCommC.cpp \ + RtecUDPAdminC.cpp libTAO_RTEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -3303,12 +3300,6 @@ EXTRA_DIST += \ if BUILD_CORBA_MESSAGING -RTEvent = \ - RtecDefaultEventDataS.cpp \ - RtecEventChannelAdminS.cpp \ - RtecEventCommS.cpp \ - RtecUDPAdminS.cpp - lib_LTLIBRARIES += libTAO_RTEvent_Skel.la libTAO_RTEvent_Skel_la_CPPFLAGS = \ @@ -3321,7 +3312,10 @@ libTAO_RTEvent_Skel_la_CPPFLAGS = \ -DTAO_RTEVENT_SKEL_BUILD_DLL libTAO_RTEvent_Skel_la_SOURCES = \ - $(RTEvent) + RtecDefaultEventDataS.cpp \ + RtecEventChannelAdminS.cpp \ + RtecEventCommS.cpp \ + RtecUDPAdminS.cpp libTAO_RTEvent_Skel_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -3355,7 +3349,18 @@ EXTRA_DIST += \ if BUILD_CORBA_MESSAGING -RTEvent = \ +lib_LTLIBRARIES += libTAO_RTEvent_Serv.la + +libTAO_RTEvent_Serv_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_RTEVENT_SERV_BUILD_DLL + +libTAO_RTEvent_Serv_la_SOURCES = \ Event/ECG_Adapters.cpp \ Event/ECG_Address_Server_Base.cpp \ Event/ECG_CDR_Message_Receiver.cpp \ @@ -3423,20 +3428,6 @@ RTEvent = \ Event/EC_Type_Filter.cpp \ Event/EC_UDP_Admin.cpp -lib_LTLIBRARIES += libTAO_RTEvent_Serv.la - -libTAO_RTEvent_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_RTEVENT_SERV_BUILD_DLL - -libTAO_RTEvent_Serv_la_SOURCES = \ - $(RTEvent) - libTAO_RTEvent_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ |