diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 11:05:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 11:05:06 +0000 |
| commit | ddc8b640b81de2f11a8b4d8a605a45edc60f4ed1 (patch) | |
| tree | 32ee53437d99c4c481f401a49676ba2cbfad7675 /shell | |
| parent | 540cf3dd924b408fc96a7015723ea54e7dfc6efc (diff) | |
INTEGRATION: CWS ause070 (1.5.4); FILE MERGED
2006/10/18 15:21:21 hjs 1.5.4.2: #i70136# change check to work with configure default
2006/10/06 12:57:32 hjs 1.5.4.1: #i70136# local targets around .ulf files
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/res/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk index f5d00267f6ec..a00f6ce74057 100644 --- a/shell/source/win32/shlxthandler/res/makefile.mk +++ b/shell/source/win32/shlxthandler/res/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: vg $ $Date: 2006-09-25 13:04:04 $ +# last change: $Author: kz $ $Date: 2006-11-08 12:05:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,11 @@ RCFILES=$(RES)$/$(TARGET).rc ULFFILES=$(TARGET).ulf +.IF "$(WITH_LANG)"!="" +ULFDIR:=$(COMMONMISC)$/$(TARGET) +.ELSE # "$(WITH_LANG)"!="" +ULFDIR:=. +.ENDIF # "$(WITH_LANG)"!="" # --- Targets ------------------------------------------------------ .INCLUDE : target.mk @@ -60,6 +65,6 @@ ULFFILES=$(TARGET).ulf # Generate the native Windows resource file # using lngconvex.exe -$(RCFILES) : $(COMMONMISC)$/$(TARGET)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt - +$(WRAPCMD) $(BIN)$/lngconvex.exe -ulf $(COMMONMISC)$/$(TARGET)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt +$(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt + +$(WRAPCMD) $(BIN)$/lngconvex.exe -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt |