diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:35:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:35:42 +0000 |
| commit | bbf74fa6e50bc8429395862428022ffa7d1f84b0 (patch) | |
| tree | 5973296c968409942da5d9349d695837a9e4425a /pyuno/source | |
| parent | 0ce5cdc4f4d20f1ae84a3367c904f305fadada91 (diff) | |
INTEGRATION: CWS ause069 (1.13.20); FILE MERGED
2006/11/24 14:52:51 hjs 1.13.20.1: #i70359# remove forced shell calls
Diffstat (limited to 'pyuno/source')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index b6f4685ce3f5..aed5e6cb9fdf 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: kz $ $Date: 2006-01-31 18:18:25 $ +# last change: $Author: obo $ $Date: 2007-01-25 15:35:42 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -115,26 +115,26 @@ ALLTAR : \ .INCLUDE : target.mk $(DLLDEST)$/%.py: %.py - +cp $? $@ + cp $? $@ .IF "$(GUI)" == "UNX" $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj .IF "$(OS)" == "LINUX" - @+ echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "SOLARIS" - @+ echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "FREEBSD" - @+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "NETBSD" - @+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "MACOSX" - @+ echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELSE - @+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ENDIF cat $(MISC)$/$(@:b).cmd - @source $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd .ENDIF |