diff options
author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-09 18:17:25 +0000 |
---|---|---|
committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-09 18:17:25 +0000 |
commit | fc17afc10604da8489d6f1990e8894107215e9cf (patch) | |
tree | 15efe383fe52ebc96bbd4e2a1258100381a075e0 | |
parent | cb79893fb274db2402d8056637b744d5d031bb50 (diff) | |
download | ATCD-fc17afc10604da8489d6f1990e8894107215e9cf.tar.gz |
ChangeLogTag: Fri Jan 9 12:20:32 2004 Boris Kolpackov <boris@dre.vanderbilt.edu>
51 files changed, 278 insertions, 143 deletions
diff --git a/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt index 8a2e9ec8c5a..f32a818bd0c 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CIDL/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := Makefile.archive target_directory_list := SemanticGraph Traversal SemanticAction @@ -16,4 +16,4 @@ default_makefile_name := Makefile.alt Makefile.archive : SemanticGraph Traversal SemanticAction -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive b/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive index 53ac3eed886..47043b77347 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive +++ b/TAO/CIAO/CCF/CCF/CIDL/Makefile.archive @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.pre.rules) cxx_translation_units := LexicalAnalyzer.cpp Parser.cpp @@ -29,6 +29,6 @@ module_base := CIDL module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Makefile.alt index 053f63b50f7..3f2dcc45f8a 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Impl/Makefile.alt @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Composition.cpp Factory.cpp HomeExecutor.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt index 087d5c90527..8291543d1a7 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.alt @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := Makefile.object target_directory_list := Impl default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.object b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.object index 5270d777460..f88e057dfb5 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.object +++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Makefile.object @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Composition.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Makefile.alt index e0168cb4dc8..6215cddb324 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Makefile.alt @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Composition.cpp Elements.cpp Executor.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt index 980929c6e88..13d18120138 100644 --- a/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CIDL/Traversal/Makefile.alt @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Elements.cpp Executor.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt index 4658bdb4a91..ae580cec268 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.pre.rules) cxx_translation_units := CommandLine.cpp \ CommandLineGrammar.cpp \ @@ -18,6 +18,6 @@ module_base := CodeGenerationKit module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.post.rules) diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt b/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt index b5b6747c233..c77b8c1af04 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/CompilerElements/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.pre.rules) cxx_translation_units := Introspection.cpp \ PreprocessorToken.cpp \ @@ -18,6 +18,6 @@ module_base := CompilerElements module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt index a70fefc2396..6566bda6d38 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL2/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := Makefile.archive target_directory_list := SemanticGraph Traversal SemanticAction @@ -16,4 +16,4 @@ default_makefile_name := Makefile.alt Makefile.archive : SemanticGraph Traversal SemanticAction -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive b/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive index fbe465ac498..d2a54081ca8 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive +++ b/TAO/CIAO/CCF/CCF/IDL2/Makefile.archive @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.pre.rules) cxx_translation_units := LexicalAnalyzer.cpp Parser.cpp @@ -74,6 +74,6 @@ module_base := IDL2 module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt index 560864c3249..6dab63b3efc 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) # Factory.cpp @@ -29,6 +29,6 @@ cxx_translation_units := Attribute.cpp \ ValueType.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt index c3491a34b5e..301fa4b003f 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := Makefile.object target_directory_list := Impl default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.object b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.object index c2dba69157c..566c5a7c576 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.object +++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Makefile.object @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Operation.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Makefile.alt index 6ad13e8d181..d22294b520c 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Attribute.cpp \ Elements.cpp \ @@ -30,6 +30,6 @@ cxx_translation_units := Attribute.cpp \ ValueType.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt index 822c3c6d384..e32ee38007a 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Attribute.cpp \ Elements.cpp \ @@ -26,6 +26,6 @@ cxx_translation_units := Attribute.cpp \ ValueType.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt index f0b683828a1..2902e330872 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL3/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := Makefile.archive target_directory_list := SemanticGraph SemanticAction Traversal @@ -16,5 +16,5 @@ default_makefile_name := Makefile.alt Makefile.archive : SemanticGraph SemanticAction Traversal -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive b/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive index f18078565aa..d71859ff81e 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive +++ b/TAO/CIAO/CCF/CCF/IDL3/Makefile.archive @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.pre.rules) cxx_translation_units := LexicalAnalyzer.cpp Parser.cpp @@ -38,6 +38,6 @@ module_base := IDL3 module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Archive.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Archive.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt index 4fed20d2057..25e22dd9176 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) # Factory.cpp @@ -27,6 +27,6 @@ cxx_translation_units := Component.cpp \ Uses.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Makefile.alt index 0e79c8593b1..440b9bf975d 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := Impl default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Makefile.alt index 6a08fb4cc84..6720f6d1944 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Component.cpp \ Elements.cpp \ @@ -16,6 +16,6 @@ cxx_translation_units := Component.cpp \ Home.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt index 0b8d65ca663..bd95b5d1c6b 100644 --- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.pre.rules) cxx_translation_units := Component.cpp EventType.cpp Home.cpp -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -$(call include, $(UTILITY_ROOT)/BuildRules/Object.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Object.post.rules) diff --git a/TAO/CIAO/CCF/CCF/Makefile.alt b/TAO/CIAO/CCF/CCF/Makefile.alt index 1516cbc040c..d374c73944b 100644 --- a/TAO/CIAO/CCF/CCF/Makefile.alt +++ b/TAO/CIAO/CCF/CCF/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := IDL2 IDL3 CIDL CodeGenerationKit CompilerElements default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Config.rules b/TAO/CIAO/CCF/Config.rules index f1d7cc4e59e..29d9fee69c1 100644 --- a/TAO/CIAO/CCF/Config.rules +++ b/TAO/CIAO/CCF/Config.rules @@ -2,7 +2,73 @@ # author : Boris Kolpackov <boris@dre.vanderbilt.edu> # cvs-id : $Id$ -# Please provide correct values for your site: +# You may provide correct values for your configuration here. # -BOOST_ROOT ?=/usr/local/boost -UTILITY_ROOT ?=/usr/local/Utility + +# Set either BOOST_ROOT or BOOST_LIB & BOOST_INCLUDE. In case +# only BOOST_ROOT is set then BOOST_LIB=$(BOOST_ROOT)/lib and +# BOOST_INCLUDE=$(BOOST_ROOT) +# +BOOST_ROOT ?= +BOOST_LIB ?= +BOOST_INCLUDE ?= + + +UTILITY_ROOT ?= +UTILITY_INCLUDE ?= +UTILITY_BUILD_RULES ?= + + +# You normally would not want to edit anything below. +# + +# Boost +# +ifneq ($(strip $(BOOST_ROOT)),) + + ifeq ($(strip $(BOOST_LIB)),) + BOOST_LIB = $(BOOST_ROOT)/lib + endif + + ifeq ($(strip $(BOOST_INCLUDE)),) + BOOST_INCLUDE = $(BOOST_ROOT) + endif + +endif + +#$(warning "boost lib : $(BOOST_LIB)") +#$(warning "boost inc$ : $(BOOST_INCLUDE)") + +ifneq ($(strip $(BOOST_LIB)),) + BOOST_LD_FLAGS := -L$(BOOST_LIB) +endif + +ifneq ($(strip $(BOOST_INCLUDE)),) + BOOST_CPP_FLAGS := -I$(BOOST_INCLUDE) +endif + + +# Utility +# +ifneq ($(strip $(UTILITY_ROOT)),) + + ifeq ($(strip $(UTILITY_INCLUDE)),) + + UTILITY_INCLUDE = $(UTILITY_ROOT) + + endif + + ifeq ($(strip $(UTILITY_BUILD_RULES)),) + + UTILITY_BUILD_RULES = $(UTILITY_ROOT)/BuildRules + + endif + +endif + +# $(warning "utility inc : $(UTILITY_INCLUDE)") +# $(warning "utility bld : $(UTILITY_BUILD_RULES)") + +ifneq ($(strip $(UTILITY_INCLUDE)),) + UTILITY_CPP_FLAGS := -I$(UTILITY_INCLUDE) +endif diff --git a/TAO/CIAO/CCF/Documentation/Build.html b/TAO/CIAO/CCF/Documentation/Build.html index 5f6210d0738..5f186966fdb 100644 --- a/TAO/CIAO/CCF/Documentation/Build.html +++ b/TAO/CIAO/CCF/Documentation/Build.html @@ -130,16 +130,31 @@ it to some convenient place.</p> <p>Before you can start building CCF you need to specify the location of Boost Libraries and Utility Library. There are two ways you can do -this. The first way is to specify environment variables -<code>BOOST_ROOT</code> and <code>UTILITY_ROOT</code> for example like -this:</p> +this. The first way is to specify environment variables <code>{BOOST_ROOT, +BOOST_INCLUDE, BOOST_LIB}</code> and <code>{UTILITY_ROOT, UTILITY_INCLUDE, +UTILITY_BUILD_RULES}</code>. Below are some examples of how you may do +that.</p> + +<p>If you would like to use Boost/Utility from the build directory:</p> <pre>$ export BOOST_ROOT=~/build/boost-1.30.2 -$ export UTILITY_ROOT=~/build/Utility-1.2.1 +$ export UTILITY_ROOT=~/build/Utility-1.2.2 </pre> -<p>Alternatively, you can specify these values in -<code>CCF/Config.rules</code></p> +<p>If Boost was installed in <code>/usr/local</code> and compiler doesn't +search there by default:</p> + +<pre>$ export BOOST_LIB=/usr/local/lib +$ export BOOST_INCLUDE=/usr/local/include +$ export UTILITY_ROOT=~/build/Utility-1.2.2 +</pre> + +<p>If Boost was installed in let's say <code>/usr/{include,lib}</code> and +compiler searches there by default you may leave <code>BOOST_*</code> +uninitialized.</p> + +<p>Alternatively, you can specify values for <code>BOOST_*</code> and +<code>UTILITY_*</code> in <code>CCF/Config.rules</code></p> <p>Finally, you can start the build process:</p> diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt index 17d395292ae..511000449ca 100644 --- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt +++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := cidlc.cpp ExecutorMappingGenerator.cpp @@ -16,10 +16,8 @@ module_base := cidlc module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) -# -L$(UTILITY_ROOT)/Utility/Introspection \ -# -lIntrospection \ CXX_LINK_LIBS += -L$(root)/CCF/CIDL \ -lCIDL \ @@ -31,8 +29,8 @@ CXX_LINK_LIBS += -L$(root)/CCF/CIDL \ -lCodeGenerationKit \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_regex \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Example/CIDL/Makefile.alt b/TAO/CIAO/CCF/Example/CIDL/Makefile.alt index a7ad5cf2faa..ae425b287a1 100644 --- a/TAO/CIAO/CCF/Example/CIDL/Makefile.alt +++ b/TAO/CIAO/CCF/Example/CIDL/Makefile.alt @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := LocalExecutorMapping default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt index 2d4e14a3a9e..7c95c4f9656 100644 --- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt +++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := indent_idl.cpp @@ -16,8 +16,8 @@ module_base := indent_idl module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/CodeGenerationKit -lCodeGenerationKit -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt index 0f09fe7a11b..077e8e9bd0b 100644 --- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt +++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/Makefile.alt @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := IDL default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt index bec22a66b07..bf93481364b 100644 --- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt +++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := indent_xml.cpp @@ -16,8 +16,8 @@ module_base := indent_xml module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/CodeGenerationKit -lCodeGenerationKit -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt b/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt index 07708e72d55..19c4c4bc8da 100644 --- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt +++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := Indentation default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Example/ComponentDeploymentDescriptor/Makefile.alt b/TAO/CIAO/CCF/Example/ComponentDeploymentDescriptor/Makefile.alt index fe4f51206e1..431c272fa31 100644 --- a/TAO/CIAO/CCF/Example/ComponentDeploymentDescriptor/Makefile.alt +++ b/TAO/CIAO/CCF/Example/ComponentDeploymentDescriptor/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := SyntaxTree.cpp Traversal.cpp cdd.cpp @@ -16,11 +16,11 @@ module_base := cdd module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/CodeGenerationKit \ -lCodeGenerationKit \ -L$(root)/CCF/CompilerElements \ -lCompilerElements -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Example/IDL2/CxxMapping/Makefile.alt b/TAO/CIAO/CCF/Example/IDL2/CxxMapping/Makefile.alt index b783266b593..d9be7f9343f 100644 --- a/TAO/CIAO/CCF/Example/IDL2/CxxMapping/Makefile.alt +++ b/TAO/CIAO/CCF/Example/IDL2/CxxMapping/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := driver.cpp Generator.cpp @@ -16,7 +16,7 @@ module_base := driver module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) @@ -24,7 +24,7 @@ CXX_LINK_LIBS += -L$(root)/CCF/IDL2 \ -lIDL2 \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Example/IDL2/Makefile.alt b/TAO/CIAO/CCF/Example/IDL2/Makefile.alt index 5e4afe7c185..bd7e6a31018 100644 --- a/TAO/CIAO/CCF/Example/IDL2/Makefile.alt +++ b/TAO/CIAO/CCF/Example/IDL2/Makefile.alt @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := CxxMapping default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Example/Makefile.alt b/TAO/CIAO/CCF/Example/Makefile.alt index 3e5d048ce70..d94483795c7 100644 --- a/TAO/CIAO/CCF/Example/Makefile.alt +++ b/TAO/CIAO/CCF/Example/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := CodeGenerationKit IDL2 CIDL default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Makefile.alt b/TAO/CIAO/CCF/Makefile.alt index a8ac2abe612..0a276543a5c 100644 --- a/TAO/CIAO/CCF/Makefile.alt +++ b/TAO/CIAO/CCF/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := CCF Test Example @@ -17,4 +17,4 @@ default_makefile_name := Makefile.alt Test : CCF Example : Test -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/CIDL/Compiler/Makefile.alt b/TAO/CIAO/CCF/Test/CIDL/Compiler/Makefile.alt index aeb0fc38f7a..c19c3f3a5a1 100644 --- a/TAO/CIAO/CCF/Test/CIDL/Compiler/Makefile.alt +++ b/TAO/CIAO/CCF/Test/CIDL/Compiler/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := driver.cpp Generator.cpp @@ -16,7 +16,7 @@ module_base := driver module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/CIDL \ @@ -27,7 +27,7 @@ CXX_LINK_LIBS += -L$(root)/CCF/CIDL \ -lIDL2 \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Test/CIDL/Makefile.alt b/TAO/CIAO/CCF/Test/CIDL/Makefile.alt index 2f6df8d549c..9c40e927d74 100644 --- a/TAO/CIAO/CCF/Test/CIDL/Makefile.alt +++ b/TAO/CIAO/CCF/Test/CIDL/Makefile.alt @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := Compiler default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/CompilerElements/CPP/Makefile.alt b/TAO/CIAO/CCF/Test/CompilerElements/CPP/Makefile.alt index 728922c9eb2..4f02253d0da 100644 --- a/TAO/CIAO/CCF/Test/CompilerElements/CPP/Makefile.alt +++ b/TAO/CIAO/CCF/Test/CompilerElements/CPP/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := driver.cpp @@ -16,9 +16,9 @@ module_base := driver module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/CompilerElements \ -lCompilerElements \ -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Test/CompilerElements/Makefile.alt b/TAO/CIAO/CCF/Test/CompilerElements/Makefile.alt index 63ed35c66d3..58d7280afeb 100644 --- a/TAO/CIAO/CCF/Test/CompilerElements/Makefile.alt +++ b/TAO/CIAO/CCF/Test/CompilerElements/Makefile.alt @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := CPP default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL2/Compiler/Makefile.alt b/TAO/CIAO/CCF/Test/IDL2/Compiler/Makefile.alt index 4ae8873a6cb..73b6a748070 100644 --- a/TAO/CIAO/CCF/Test/IDL2/Compiler/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL2/Compiler/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := driver.cpp @@ -18,14 +18,14 @@ module_base := driver module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/IDL2 \ -lIDL2 \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL2/Makefile.alt b/TAO/CIAO/CCF/Test/IDL2/Makefile.alt index 35a4e82e525..d8b36f4b731 100644 --- a/TAO/CIAO/CCF/Test/IDL2/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL2/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := Compiler \ @@ -20,5 +20,5 @@ default_makefile_name := Makefile.alt Traversal : SemanticGraph Compiler : Traversal -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/HandBuilt/Makefile.alt b/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/HandBuilt/Makefile.alt index ff31afbd311..806d14771c0 100644 --- a/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/HandBuilt/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/HandBuilt/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := hand_built.cpp Builder.cpp @@ -16,14 +16,14 @@ module_base := hand_built module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/IDL2 \ -lIDL2 \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/Makefile.alt b/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/Makefile.alt index 34ecdacbc97..3a59fa55404 100644 --- a/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL2/SemanticGraph/Makefile.alt @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := HandBuilt default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL2/Traversal/Makefile.alt b/TAO/CIAO/CCF/Test/IDL2/Traversal/Makefile.alt index af61a8f0159..7e498776ee5 100644 --- a/TAO/CIAO/CCF/Test/IDL2/Traversal/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL2/Traversal/Makefile.alt @@ -8,11 +8,11 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := Recreate default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL2/Traversal/Recreate/Makefile.alt b/TAO/CIAO/CCF/Test/IDL2/Traversal/Recreate/Makefile.alt index 71a3f9d57b5..601f6749c57 100644 --- a/TAO/CIAO/CCF/Test/IDL2/Traversal/Recreate/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL2/Traversal/Recreate/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := recreate.cpp Generator.cpp @@ -18,7 +18,7 @@ module_base := recreate module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) # -L$(root)/CCF/CompilerElements \ # -lCompilerElements \ @@ -27,7 +27,7 @@ CXX_LINK_LIBS += -L$(root)/CCF/IDL2 \ -lIDL2 \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL3/Compiler/Makefile.alt b/TAO/CIAO/CCF/Test/IDL3/Compiler/Makefile.alt index f0fdb5339b7..4dc5c72d511 100644 --- a/TAO/CIAO/CCF/Test/IDL3/Compiler/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL3/Compiler/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) cxx_translation_units := driver.cpp Generator.cpp @@ -16,7 +16,7 @@ module_base := driver module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/IDL3 \ @@ -25,7 +25,7 @@ CXX_LINK_LIBS += -L$(root)/CCF/IDL3 \ -lIDL2 \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/CCF/Test/IDL3/Makefile.alt b/TAO/CIAO/CCF/Test/IDL3/Makefile.alt index 912494533ac..7e9518a302d 100644 --- a/TAO/CIAO/CCF/Test/IDL3/Makefile.alt +++ b/TAO/CIAO/CCF/Test/IDL3/Makefile.alt @@ -8,12 +8,12 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := Compiler default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CCF/Test/Makefile.alt b/TAO/CIAO/CCF/Test/Makefile.alt index c252ea7e63f..607d1b640bd 100644 --- a/TAO/CIAO/CCF/Test/Makefile.alt +++ b/TAO/CIAO/CCF/Test/Makefile.alt @@ -8,10 +8,10 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.pre.rules) target_makefile_list := target_directory_list := CompilerElements IDL2 IDL3 CIDL default_makefile_name := Makefile.alt -$(call include, $(UTILITY_ROOT)/BuildRules/Recursion.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Recursion.post.rules) diff --git a/TAO/CIAO/CIDLC/Makefile.alt b/TAO/CIAO/CIDLC/Makefile.alt index 2683acdff9f..46fbd0ea239 100644 --- a/TAO/CIAO/CIDLC/Makefile.alt +++ b/TAO/CIAO/CIDLC/Makefile.alt @@ -8,7 +8,7 @@ include $(root)/Bootstrap.rules $(call include, $(root)/Config.rules) -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.pre.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.pre.rules) # RepositoryIdGenerator.cpp \ @@ -26,7 +26,7 @@ module_base := cidlc module_prefix := module_suffix := -CXX_PREPROCESS_FLAGS += -I$(root) -I$(UTILITY_ROOT) -I$(BOOST_ROOT) +CXX_PREPROCESS_FLAGS += -I$(root) $(UTILITY_CPP_FLAGS) $(BOOST_CPP_FLAGS) CXX_LINK_LIBS += -L$(root)/CCF/CIDL \ -lCIDL \ @@ -38,8 +38,8 @@ CXX_LINK_LIBS += -L$(root)/CCF/CIDL \ -lCodeGenerationKit \ -L$(root)/CCF/CompilerElements \ -lCompilerElements \ - -L$(BOOST_ROOT)/lib \ + $(BOOST_LD_FLAGS) \ -lboost_regex \ -lboost_filesystem -$(call include, $(UTILITY_ROOT)/BuildRules/Executable.post.rules) +$(call include, $(UTILITY_BUILD_RULES)/Executable.post.rules) diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 8a96ab9ea80..a960435c1e0 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,59 @@ +Fri Jan 9 12:20:32 2004 Boris Kolpackov <boris@dre.vanderbilt.edu> + + * CCF/Config.rules: + * CCF/Makefile.alt: + * CCF/CCF/Makefile.alt: + * CCF/CCF/CIDL/Makefile.alt: + * CCF/CCF/CIDL/Makefile.archive: + * CCF/CCF/CIDL/SemanticAction/Makefile.alt: + * CCF/CCF/CIDL/SemanticAction/Makefile.object: + * CCF/CCF/CIDL/SemanticAction/Impl/Makefile.alt: + * CCF/CCF/CIDL/SemanticGraph/Makefile.alt: + * CCF/CCF/CIDL/Traversal/Makefile.alt: + * CCF/CCF/CodeGenerationKit/Makefile.alt: + * CCF/CCF/CompilerElements/Makefile.alt: + * CCF/CCF/IDL2/Makefile.alt: + * CCF/CCF/IDL2/Makefile.archive: + * CCF/CCF/IDL2/SemanticAction/Makefile.alt: + * CCF/CCF/IDL2/SemanticAction/Makefile.object: + * CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt: + * CCF/CCF/IDL2/SemanticGraph/Makefile.alt: + * CCF/CCF/IDL2/Traversal/Makefile.alt: + * CCF/CCF/IDL3/Makefile.alt: + * CCF/CCF/IDL3/Makefile.archive: + * CCF/CCF/IDL3/SemanticAction/Makefile.alt: + * CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt: + * CCF/CCF/IDL3/SemanticGraph/Makefile.alt: + * CCF/CCF/IDL3/Traversal/Makefile.alt: + * CCF/Documentation/Build.html: + * CCF/Example/Makefile.alt: + * CCF/Example/CIDL/Makefile.alt: + * CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt: + * CCF/Example/CodeGenerationKit/Makefile.alt: + * CCF/Example/CodeGenerationKit/Indentation/Makefile.alt: + * CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt: + * CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt: + * CCF/Example/ComponentDeploymentDescriptor/Makefile.alt: + * CCF/Example/IDL2/Makefile.alt: + * CCF/Example/IDL2/CxxMapping/Makefile.alt: + * CCF/Test/Makefile.alt: + * CCF/Test/CIDL/Makefile.alt: + * CCF/Test/CIDL/Compiler/Makefile.alt: + * CCF/Test/CompilerElements/Makefile.alt: + * CCF/Test/CompilerElements/CPP/Makefile.alt: + * CCF/Test/IDL2/Makefile.alt: + * CCF/Test/IDL2/Compiler/Makefile.alt: + * CCF/Test/IDL2/SemanticGraph/Makefile.alt: + * CCF/Test/IDL2/SemanticGraph/HandBuilt/Makefile.alt: + * CCF/Test/IDL2/Traversal/Makefile.alt: + * CCF/Test/IDL2/Traversal/Recreate/Makefile.alt: + * CCF/Test/IDL3/Makefile.alt: + * CCF/Test/IDL3/Compiler/Makefile.alt: + * CIDLC/Makefile.alt: + + Added 'flexibility' variables to Config.rules and + updated makefiles to reflect this change. + Thu Jan 8 15:33:31 2004 Tao Lu <lu@dre.vanderbilt.edu> * CCF/CCF/CCF.mwc |