diff options
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC/Simple/Makefile')
-rw-r--r-- | TAO/orbsvcs/examples/RtEC/Simple/Makefile | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile index 4882df5c9ad..583e163fa38 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile +++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile @@ -24,7 +24,7 @@ ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) endif # Event2 PSRC=$(addsuffix .cpp,$(BIN)) -LDLIBS = -lorbsvcs -lTAO +LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) @@ -65,9 +65,6 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ @@ -360,7 +357,7 @@ endif $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ @@ -368,6 +365,7 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ @@ -381,6 +379,7 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ @@ -412,9 +411,6 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ @@ -694,7 +690,7 @@ endif $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ @@ -702,6 +698,7 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ @@ -716,6 +713,7 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ @@ -729,7 +727,6 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i .obj/Supplier.o .obj/Supplier.so .shobj/Supplier.o .shobj/Supplier.so: Supplier.cpp Supplier.h \ @@ -746,9 +743,6 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ @@ -1028,7 +1022,7 @@ endif $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ @@ -1036,6 +1030,7 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ @@ -1050,6 +1045,7 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ @@ -1063,7 +1059,6 @@ endif $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY |