diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
| commit | fcd1e07f252c3e44a5707e9e9ee429a5cef98fc8 (patch) | |
| tree | 6c32d7bfc642c6a3b8fd32ae9f2cf93e7ca3f8de /pyuno | |
| parent | a580a1837bedb94e3c95fa48ce602a2ac04b7117 (diff) | |
CWS-TOOLING: integrate CWS l10nframework01
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 6 | ||||
| -rw-r--r-- | pyuno/source/module/makefile.mk | 5 | ||||
| -rwxr-xr-x | pyuno/zipcore/makefile.mk | 7 |
3 files changed, 14 insertions, 4 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 11ece4796301..6acb867618be 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk - +.IF "$(L10N_framework)"=="" DLLPRE = #------------------------------------------------------------------- @@ -101,9 +101,10 @@ COMPONENTS= \ ALL : ALLTAR \ $(DLLDEST)$/pythonloader.py \ $(DLLDEST)$/pyuno_services.rdb +.ENDIF # L10N_framework .INCLUDE : target.mk - +.IF "$(L10N_framework)"=="" $(DLLDEST)$/%.py: %.py cp $? $@ @@ -115,4 +116,5 @@ $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLL cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i)) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb +.ENDIF # L10N_framework diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index cb1ef41f0784..2357d0062ed0 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -39,6 +39,7 @@ LINKFLAGSDEFS = # do not fail with missing symbols # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" #------------------------------------------------------------------- .IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4" @@ -128,10 +129,11 @@ ALLTAR : \ $(DLLDEST)$/unohelper.py \ $(PYUNO_MODULE) \ $(MISC)$/$(PYUNORC) +.ENDIF .ENDIF .INCLUDE : target.mk - +.IF "$(L10N_framework)"=="" $(DLLDEST)$/%.py: %.py cp $? $@ @@ -163,4 +165,5 @@ $(MISC)$/$(PYUNORC) : pyuno $(MISC)$/pyuno.flt : pyuno.flt -rm -f $@ cat $? > $@ +.ENDIF # L10N_framework diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk index f46106dc8afe..a820c1a59f4f 100755 --- a/pyuno/zipcore/makefile.mk +++ b/pyuno/zipcore/makefile.mk @@ -36,7 +36,7 @@ TARGET=zipcore LIBTARGET=NO .INCLUDE : settings.mk - +.IF "$(L10N_framework)"=="" UWINAPILIB = .IF "$(SYSTEM_PYTHON)" == "YES" || "$(GUI)" == "OS2" @@ -74,6 +74,7 @@ APP1RPATH = BRAND OBJFILES = $(OBJ)$/python.obj .ENDIF + .INCLUDE: target.mk ALLTAR: \ @@ -129,3 +130,7 @@ $(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST) .ENDIF .ENDIF +.ELSE +ivo: + $(ECHO) +.ENDIF # L10N_framework |