diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:38:46 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:38:46 +0000 |
| commit | bccada5fbc787f3011d616a64b88e50262ac3af4 (patch) | |
| tree | 3d39c482e7713a689031a4eba437ac1285009c8e /udkapi | |
| parent | 5dcd9650226ef0301e2e8547b500d47527a65649 (diff) | |
INTEGRATION: CWS ause069 (1.5.42); FILE MERGED
2006/12/01 17:36:36 hjs 1.5.42.1: #i70359# remove forced shell calls
Diffstat (limited to 'udkapi')
| -rw-r--r-- | udkapi/prj/makefile.mk | 8 | ||||
| -rw-r--r-- | udkapi/util/target.pmk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/udkapi/prj/makefile.mk b/udkapi/prj/makefile.mk index 025336bdc..012cd191b 100644 --- a/udkapi/prj/makefile.mk +++ b/udkapi/prj/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-09 16:43:36 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:38:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -63,7 +63,7 @@ INCLUDES= \ .INCLUDE: $(INCLUDES) out$/$(PRJNAME).rdb:: $(ALLIDLFILES) - +unoidl @$(mktmp -I$(PRJ) -Burd -OHout $(ALLIDLFILES:+"\n")) - +regmerge @$(mktmp $@ /UCR out$/{$(?:f:s/.idl/.urd/:+"\n")} ) + unoidl @$(mktmp -I$(PRJ) -Burd -OHout $(ALLIDLFILES:+"\n")) + regmerge @$(mktmp $@ /UCR out$/{$(?:f:s/.idl/.urd/:+"\n")} ) touch $@ diff --git a/udkapi/util/target.pmk b/udkapi/util/target.pmk index 0e81e3489..3d844b70d 100644 --- a/udkapi/util/target.pmk +++ b/udkapi/util/target.pmk @@ -4,9 +4,9 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-09 16:44:28 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:38:46 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -34,8 +34,8 @@ #************************************************************************* $(OUT)$/misc$/$(TARGET).idls: makefile.mk - +-$(RM) $@ - +$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@ + -$(RM) $@ + $(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@ ALLTAR: $(OUT)$/misc$/$(TARGET).idls |