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 | 958f02110086aae53e888d7a7e9b3304d33b1b93 (patch) | |
| tree | ce855bcb2076a520e0f9bc3834c336b2e8ee02a3 | |
| parent | CWS-TOOLING: integrate CWS odff06 (diff) | |
| download | binfilter-958f02110086aae53e888d7a7e9b3304d33b1b93.tar.gz binfilter-958f02110086aae53e888d7a7e9b3304d33b1b93.zip | |
CWS-TOOLING: integrate CWS l10nframework01
| -rw-r--r-- | binfilter/bf_offmgr/util/makefile.mk | 8 | ||||
| -rw-r--r-- | binfilter/util/makefile.mk | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/binfilter/bf_offmgr/util/makefile.mk b/binfilter/bf_offmgr/util/makefile.mk index a7354021a..c9e542b68 100644 --- a/binfilter/bf_offmgr/util/makefile.mk +++ b/binfilter/bf_offmgr/util/makefile.mk @@ -53,14 +53,13 @@ SOLARLIB+=-L$(LB) # --- Allgemein ----------------------------------------------------------- -RES1FILELIST=\ +RESLIB1LIST=\ $(SRS)$/so3_src.srs RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES=$(RES1FILELIST) +RESLIB1SRSFILES=$(RESLIB1LIST) # ------------------------------------------------------------------------- - LIB3TARGET= $(SLB)$/$(TARGET).lib LIB3FILES= $(SLB)$/offmgr_app.lib @@ -98,6 +97,7 @@ LIB4TARGET= $(LB)$/a$(TARGET).lib LIB4FILES= $(LB)$/$(TARGET).lib .ENDIF +.IF "$(L10N_framework)"=="" .IF "$(BUILD_SOSL)"=="" .IF "$(depend)" == "" ALL:\ @@ -107,6 +107,7 @@ ALL:\ .ENDIF # "$(depend)" == "" .ENDIF # "$(BUILD_SOSL)" == "" +.ENDIF .INCLUDE : target.mk @@ -138,4 +139,3 @@ $(INCCOM)$/class.lst: @echo nix .ENDIF .ENDIF # "$(BUILD_SOSL)"=="" - diff --git a/binfilter/util/makefile.mk b/binfilter/util/makefile.mk index 0c48b2e19..bec1a2b0e 100644 --- a/binfilter/util/makefile.mk +++ b/binfilter/util/makefile.mk @@ -41,7 +41,7 @@ TARGET=bf_util .INCLUDE : settings.mk # --- Files ------------------------------------- - +.IF "$(L10N_framework)"=="" .IF "$(GUI)"=="UNX" LOCALLIBDIR=$(LB) .ELSE # "$(GUI)"=="UNX" @@ -61,11 +61,12 @@ RDBNAMES= \ bf_wrapper RDBLIBS=$(foreach,i,$(strip $(RDBNAMES)) $(LOCALLIBDIR)$/$(DLLPRE)$i$(DLLPOSTFIX)$(DLLPOST)) +.ENDIF # --- Targets ---------------------------------- .INCLUDE : target.mk - +.IF "$(L10N_framework)"=="" ALLTAR : $(BIN)$/legacy_binfilters.rdb .IF "$(OS)" == "WNT" @@ -77,3 +78,6 @@ my_OOO_BIN_PATH = OOO_BASE_DIR $(BIN)$/legacy_binfilters.rdb : $(RDBLIBS) @@-$(RM) $@ cd $(LOCALLIBDIR) && $(REGCOMP) -register -r ..$/bin$/$(@:f) -wop=vnd.sun.star.expand:$(EMQ)$$$(my_OOO_BIN_PATH)/program/ $(foreach,i,$(RDBLIBS) -c $(subst,$(LOCALLIBDIR)$/,./ $i)) + +.ELSE +pseudo: |