diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-05 23:30:13 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-05 23:30:13 +0000 |
| commit | 5710b39aa7385729e9d56cd7fc545bf7d87820d7 (patch) | |
| tree | 39c9e6afbbe426416ffb4bab553b79446853dcc1 /TAO | |
| parent | 92f120fa3e4fd1d79cae6072a78ea8c1012801cc (diff) | |
| download | ATCD-5710b39aa7385729e9d56cd7fc545bf7d87820d7.tar.gz | |
ChangeLogTag: Thu Sep 5 23:28:29 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 52 |
2 files changed, 33 insertions, 25 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 00c63ce3516..4209aa1227d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 5 23:28:29 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/orbsvcs/Makefile: Instead of iterating through + the list of directories specified by DIRS in a for loop, + use a scheme similar to the one in rules.nested.GNU. + Thu Sep 5 09:46:38 2002 Priyanka Gontla <pgontla@ece.uci.edu> * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index e469e05902e..7274457bde3 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -15,6 +15,7 @@ MAKEFILE = Makefile #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(TAO_ROOT)/taoconfig.mk @@ -197,38 +198,39 @@ endif # Local rules #---------------------------------------------------------------------------- -all: ORBSVCS_COMPONENTS +## If parallel makes (-j) are invoked , we want to make sure that the order +## of the Makefiles invoked from this Makefile is preserved. +## Recursively invoked makes from this file will still be run in parallel. +.NOTPARALLEL: -realclean:: -ifneq ($(MKLIST),) - ifeq (Windows,$(findstring Windows,$(OS))) - @cmd /c "FOR /D %m IN ($(MKLIST)) DO $(MAKE) -f %m MAKEFILE=$$m $(@:.nested=)" - else # ! Windows - @for m in $(MKLIST); do \ - echo $$m; \ - $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \ - done - endif # ! Windows -endif # MKLIST - -all debug profile optimize install deinstall clean clobber depend rcs_info idl_stubs: +all: ORBSVCS_COMPONENTS + +realclean: ORBSVCS_COMPONENTS_realclean + +## Makefile.Svc_Utils.mkfile is a dummy target which will cause +## $(MAKE) -f Makefile.Svc_Utils to be invoked +%.mkfile: % + @echo $(MAKE) -f $< $(MKFILE_TARGET) + @$(MAKE) -f $< $(MKFILE_TARGET) + +# This rule invokes make again with the list of .mkfile targets as a +# parameter. For example, if the all target is being made, make is invoked +# as follows: +# +# make -f Makefile MKFILE_TARGET=all Makefile.Svc_Utils.mkfile \ +# Makefile.CosNaming.mkfile ..... +all debug profile install deinstall clean clobber depend rcs_info idl_stubs realclean: ifneq ($(MKLIST),) - ifeq (Windows,$(findstring Windows,$(OS))) - @cmd /c "FOR /D %m IN ($(MKLIST)) DO $(MAKE) -f %m MAKEFILE=$$m $(@:.nested=)" - else # ! Windows - @for m in $(MKLIST); do \ - echo $$m; \ - $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \ - done - endif # ! Windows -endif # MKLIST + @echo $(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) + @$(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) +endif .PHONY: ORBSVCS_COMPONENTS ORBSVCS_COMPONENTS: @sh $(ACE_ROOT)/bin/ace_components --orbsvcs --set ' $(TAO_ORBSVCS) ' - -realclean:: +.PHONY: ORBSVCS_COMPONENTS_realclean +ORBSVCS_COMPONENTS_realclean: -$(RM) ORBSVCS_COMPONENTS.list #---------------------------------------------------------------------------- |