diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-25 21:16:11 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-25 21:16:11 +0000 |
| commit | ea9918856920208341fa0670b48f9c9294e86510 (patch) | |
| tree | d7b73d68fff49d17f1fa51906c758d5b0a0e8989 | |
| parent | 80e777ab9863184a05910b0f69215fe24c02548c (diff) | |
| download | ATCD-ea9918856920208341fa0670b48f9c9294e86510.tar.gz | |
ChangeLogTag: Wed Sep 25 16:12:27 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/Makefile | 24 | ||||
| -rw-r--r-- | TAO/TAO_IDL/Makefile.dependencies | 2 |
3 files changed, 33 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c63d08e2258..7cca31169a9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,18 @@ +Wed Sep 25 16:12:27 2002 Jeff Parsons <parsons@cs.wustl.edu> + + * TAO_IDL/Makefile: + + Remove for loop and use recursive make rule + similar to the one in rules.nested.GNU. This will enable better + detection of build errors during recursive makes. + + * TAO_IDL/Makefile.dependencies: + + Add MAKEFILE=Makefile.dependencies so + that recursive makes will work properly. + + Patches and comments sent in by Craig Rodrigues <crodrigu@bbn.com>. + Wed Sep 25 14:35:17 2002 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/Makefile.BE: diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile index 12a4a18836f..5c5d0fbc398 100644 --- a/TAO/TAO_IDL/Makefile +++ b/TAO/TAO_IDL/Makefile @@ -39,15 +39,23 @@ MKLIST = \ Makefile.EXE \ Makefile.dependencies +## 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: + +## Makefile.BE.mkfile is a dummy target which will cause +## $(MAKE) -f Makefile.BE to be invoked +%.mkfile: % + @echo $(MAKE) -f $< $(MKFILE_TARGET) + @$(MAKE) -f $< $(MKFILE_TARGET) + all debug profile optimize install deinstall clean realclean clobber depend idl_stubs : -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 +ifneq ($(MKLIST),) + @echo $(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) + @$(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) +endif + endif # ! CROSS-COMPILE diff --git a/TAO/TAO_IDL/Makefile.dependencies b/TAO/TAO_IDL/Makefile.dependencies index 5cb74a9cb22..dc75c66f7c0 100644 --- a/TAO/TAO_IDL/Makefile.dependencies +++ b/TAO/TAO_IDL/Makefile.dependencies @@ -8,6 +8,8 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT +MAKEFILE=Makefile.dependencies + #---------------------------------------------------------------------------- # Include macros #---------------------------------------------------------------------------- |