diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-07-05 13:41:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-07-05 13:41:05 +0000 |
| commit | a952d6ab5cee6a41d8097f01c4c9c16687f75fab (patch) | |
| tree | 5bc322e0a5b958cabfce4e45bd7a8b85d58c4223 /TAO | |
| parent | f9531f79a74889b85a8dd64a6027bc7f82449f9e (diff) | |
| download | ATCD-a952d6ab5cee6a41d8097f01c4c9c16687f75fab.tar.gz | |
ChangeLogTag: Sat Jul 05 13:34:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/PSS/Makefile | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 633ff1eaa6b..f9b8bf85efb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Jul 5 13:39:10 UTC 2003 Johnny Willemsne <jwillemsen@remedy.nl> + + * orbsvcs/IFR_Service/Makefile: + * orbsvcs/PSS/Makefile: + Removed windows specific parts from these makefiles. These are not + needed and cause problems when using windows and the msys shell. + This solves several compile problems in the MinGW build. Thanks to + Martin Corino <mcorino@remedy.nl> for finding this. + Sat Jul 5 08:17:54 UTC 2003 Johnny Willemsne <jwillemsen@remedy.nl> * rules.tao.GNU: diff --git a/TAO/orbsvcs/IFR_Service/Makefile b/TAO/orbsvcs/IFR_Service/Makefile index e54ff46cafe..6cc30423d29 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile +++ b/TAO/orbsvcs/IFR_Service/Makefile @@ -22,14 +22,14 @@ include $(TAO_ROOT)/rules.tao.GNU # Define local rules and targets #--------------------------------------------------------------------------- ifneq ($(CROSS-COMPILE),) - all debug profile optimize install deinstall: + all debug profile optimize install deinstall: @echo The IFR Service requires a TAO_IDL library which isn\'t be built for CROSS-COMPILE platforms. clean realclean: @echo Nothing to clean in IFR_Service on CROSS-COMPILE platforms. else # ! CROSS-COMPILE ifeq ($(findstring xlC,$(CXX)),xlC) - all debug profile optimize install deinstall: + all debug profile optimize install deinstall: @echo The IFR Service requires the using keyword which isn\'t supported by this compiler. clean realclean: @@ -38,14 +38,10 @@ else MKLIST = Makefile.IFR_Service Makefile.tao_ifr 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 endif # ! aix_build endif # ! CROSS-COMPILE diff --git a/TAO/orbsvcs/PSS/Makefile b/TAO/orbsvcs/PSS/Makefile index d4e100012ee..7861de13c66 100644 --- a/TAO/orbsvcs/PSS/Makefile +++ b/TAO/orbsvcs/PSS/Makefile @@ -93,14 +93,10 @@ endif MKLIST = Makefile.datastore Makefile.parser 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 #---------------------------------------------------------------------------- # Dependencies |