diff options
author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-31 17:07:13 +0000 |
---|---|---|
committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-31 17:07:13 +0000 |
commit | 5fc83d7297067b4ee37d8b605f5c3a4891b515f9 (patch) | |
tree | 6086d6d1255ab903e6b706871816c4b75dd88c20 | |
parent | f51de1d486d34d4e92b87c89df60c8ccaad70961 (diff) | |
download | ATCD-5fc83d7297067b4ee37d8b605f5c3a4891b515f9.tar.gz |
ChangeLogTag:Thu Aug 31 09:46:44 2000 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/Logging_Service/Makefile | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosNotification | 3 | ||||
-rw-r--r-- | TAO/tests/DynAny_Test/Makefile | 7 |
5 files changed, 23 insertions, 13 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 33aa04d4226..258c0979026 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,17 @@ +Thu Aug 31 09:46:44 2000 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/orbsvcs/Makefile.CosNotification: + Fixed the if/else/endif for ACE_HAS_GNUG_PRE_2_8 + + * orbsvcs/Logging_Service/Makefile: + * orbsvcs/orbsvcs/Makefile: + Enable the Logging and AV streaming services on minimum CORBA + builds, they were disabled because they depend on Trading, but + that service now builds with minimum CORBA. + + * tests/DynAny_Test/Makefile: + Now we can test Dynamic Anys even in minimum CORBA builds + Wed Aug 30 19:20:00 2000 Kirthika Parameswaran <kirthika@cs.wustl.edu> * TAO_IDL/be/be_visitor_argument/paramlist.cpp: diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile index 4418a1e5f2f..d1c992543e5 100644 --- a/TAO/orbsvcs/Logging_Service/Makefile +++ b/TAO/orbsvcs/Logging_Service/Makefile @@ -10,7 +10,7 @@ LSRC = Logging_Service.cpp LOG_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO +LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO BIN2 = Logging_Service @@ -27,9 +27,7 @@ include $(TAO_ROOT)/rules.tao.GNU TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Log,$(findstring Log,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - ifeq ($(minimum_corba),0) - BIN = $(BIN2) - endif # minimum_corba + BIN = $(BIN2) endif # Naming endif # Log diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index 2be154908f7..80efa83b1ec 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -34,14 +34,16 @@ ifndef TAO_ORBSVCS RTOLDEvent \ RTSchedEvent \ Concurrency \ - Trader + Trader \ + Log \ + AV ifeq ($(minimum_corba),0) # Trader uses DynAny which is disabled when compiling with minimum # CORBA support. LifeCycle, Log, AV and Notify depend on Trader # so don't build them either, with minimum CORBA. - TAO_ORBSVCS += Log AV + TAO_ORBSVCS += ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) TAO_ORBSVCS += LifeCycle diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification index eb5653676df..2ad9c73cc86 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification @@ -28,7 +28,7 @@ ifeq ($(ACE_HAS_GNUG_PRE_2_8),1) # Notify will not build on g++ prior to 2.8.0. all clean realclean: @echo TAO Notification Service is not built with older versions of g++ -endif # ! ACE_HAS_GNUG_PRE_2_8 +else # ! ACE_HAS_GNUG_PRE_2_8 # On non-Windows environment, we should at least define # the export_include IDL flag. @@ -123,6 +123,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ realclean: clean -$(RM) $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext))) +endif #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile index 0b9bb5cb340..b5be4454985 100644 --- a/TAO/tests/DynAny_Test/Makefile +++ b/TAO/tests/DynAny_Test/Makefile @@ -33,7 +33,7 @@ BASIC_TEST_FILES = da_testsC \ BASIC_TEST_OBJS = $(addsuffix .o, $(BASIC_TEST_FILES)) SRC = $(addsuffix .cpp, $(BASIC_TEST_FILES)) -BIN_UNCHECKED = basic_test +BIN = basic_test TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -44,11 +44,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU - -ifeq ($(minimum_corba),0) -BIN=$(BIN_UNCHECKED) -endif # minimum_corba - include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU |