diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-29 15:36:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-29 15:36:08 +0000 |
| commit | 5ff0af86b0eddbbf00e1a5c9f26e27e35707929e (patch) | |
| tree | cce17c293e90a51c9210b8e77ce7c19c21f16c43 /oovbaapi | |
| parent | c8899cb7ced91b9c12d17057495c6f35ab8424b3 (diff) | |
| parent | 7ac3cbc92e93eabfbbbf65b8ac429afc28f84b2e (diff) | |
ab71: merge with DEV300_m63
Diffstat (limited to 'oovbaapi')
| -rw-r--r-- | oovbaapi/genconstidl/makefile.mk | 6 | ||||
| -rw-r--r-- | oovbaapi/ooo/vba/constants/makefile.mk | 8 | ||||
| -rw-r--r-- | oovbaapi/ooo/vba/makefile.mk | 7 | ||||
| -rw-r--r-- | oovbaapi/util/makefile.mk | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/oovbaapi/genconstidl/makefile.mk b/oovbaapi/genconstidl/makefile.mk index 42219545c6..95363d56c3 100644 --- a/oovbaapi/genconstidl/makefile.mk +++ b/oovbaapi/genconstidl/makefile.mk @@ -36,6 +36,8 @@ PRJNAME=oovbaapi .INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" + .IF "$(ENABLE_VBA)"!="YES" dummy: @echo "not building vba..." @@ -70,3 +72,7 @@ CLEAN : @$(RM) $(MY_GEN_IDL_PATH)$/*.idl @$(RM) $(foreach,i,$(MYSYMFILES) $(MISC)$/$(i:b).done) +.ELSE +ivo: + $(ECHO) +.ENDIF # L10N_framework diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk index 9fb0e9144d..fa9cdaddc1 100644 --- a/oovbaapi/ooo/vba/constants/makefile.mk +++ b/oovbaapi/ooo/vba/constants/makefile.mk @@ -36,6 +36,7 @@ TARGET=constants PACKAGE=org$/vba$/constants # --- Settings ----------------------------------------------------- + .INCLUDE : $(PRJ)$/util$/makefile.pmk .IF "$(ENABLE_VBA)"!="YES" @@ -43,8 +44,8 @@ dummy: @echo "not building vba..." .ELSE +.IF "$(L10N_framework)"=="" # ------------------------------------------------------------------------ - # I tried to use the IDLFILES target but it failed dismally MY_GEN_IDL_PATH=$(MISC)$/idl MY_GEN_UCR_PATH=$(OUT)$/ucr$/$(PACKAGE) @@ -53,10 +54,11 @@ MYTMPIDLFILES=$(shell @ls $(MY_GEN_IDL_PATH)) MYIDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i)) MYURDFILES=$(foreach,i,$(MYIDLFILES) $(MY_GEN_UCR_PATH)$/$(i:b).urd) MYDBTARGET=$(OUT)$/ucr/constants.db - +.ENDIF .INCLUDE : target.mk +.IF "$(L10N_framework)"=="" ALLTAR: $(MYDBTARGET) $(MY_GEN_UCR_PATH)$/%.urd: $(MY_GEN_IDL_PATH)$/%.idl @@ -66,4 +68,4 @@ $(MYDBTARGET) : $(MYURDFILES) $(MYIDLFILES) $(REGMERGE) $(OUT)$/ucr/constants.db /UCR @$(mktmp $(MYURDFILES)) .ENDIF - +.ENDIF diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk index ee63d6373f..99a11e5ac0 100644 --- a/oovbaapi/ooo/vba/makefile.mk +++ b/oovbaapi/ooo/vba/makefile.mk @@ -41,10 +41,10 @@ PACKAGE=ooo$/vba .IF "$(ENABLE_VBA)"!="YES" dummy: @echo "not building vba..." -.ENDIF +.ELSE # ------------------------------------------------------------------------ - +.IF "$(L10N_framework)"="" IDLFILES=\ XErrObject.idl \ XGlobals.idl \ @@ -60,5 +60,6 @@ IDLFILES=\ Globals.idl\ # ------------------------------------------------------------------ - +.ENDIF .INCLUDE : target.mk +.ENDIF diff --git a/oovbaapi/util/makefile.mk b/oovbaapi/util/makefile.mk index 97e592a7c0..9fbd349b08 100644 --- a/oovbaapi/util/makefile.mk +++ b/oovbaapi/util/makefile.mk @@ -45,6 +45,7 @@ dummy: @echo "not building vba..." .ENDIF +.IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ UNOIDLDBFILES= \ $(UCR)$/vba.db \ @@ -53,5 +54,6 @@ UNOIDLDBFILES= \ $(UCR)$/constants.db # --- Targets ------------------------------------------------------ +.ENDIF .INCLUDE : target.mk |