diff options
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/inc/makefile.mk | 3 | ||||
-rw-r--r-- | ucb/source/cacher/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/core/makefile.mk | 3 | ||||
-rw-r--r-- | ucb/source/regexp/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/sorter/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/ucp/expand/makefile.mk | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/makefile.mk | 3 | ||||
-rw-r--r-- | ucb/source/ucp/gio/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/ucp/gvfs/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/ucp/package/makefile.mk | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/makefile.mk | 3 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/makefile.mk | 2 |
14 files changed, 32 insertions, 2 deletions
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk index 90c4f96a1f68..c98dc5fe07e2 100644 --- a/ucb/inc/makefile.mk +++ b/ucb/inc/makefile.mk @@ -41,6 +41,7 @@ TARGET=inc # --- Targets ------------------------------------------------------- .INCLUDE : target.mk +.IF "$(L10N_framework)"=="" .IF "$(ENABLE_PCH)"!="" ALLTAR : \ @@ -48,4 +49,4 @@ ALLTAR : \ $(SLO)$/precompiled_ex.pch .ENDIF # "$(ENABLE_PCH)"!="" - +.ENDIF # L10N_framework diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk index dd4d9b398229..09717b3f0f7e 100644 --- a/ucb/source/cacher/makefile.mk +++ b/ucb/source/cacher/makefile.mk @@ -39,6 +39,7 @@ NO_BSYMBOLIC=TRUE UCB_MAJOR=1 .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/contentresultsetwrapper.obj \ @@ -65,6 +66,7 @@ SHL1IMPLIB=i$(TARGET) SHL1VERSIONMAP=exports.map DEF1NAME=$(SHL1TARGET) +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk index 963aa038dab0..e70b5ca879ef 100644 --- a/ucb/source/core/makefile.mk +++ b/ucb/source/core/makefile.mk @@ -39,6 +39,7 @@ NO_BSYMBOLIC=TRUE UCB_MAJOR=1 .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/identify.obj \ @@ -72,5 +73,7 @@ SHL1VERSIONMAP=exports.map DEF1NAME=$(SHL1TARGET) +.ENDIF # L10N_framework + .INCLUDE: target.mk diff --git a/ucb/source/regexp/makefile.mk b/ucb/source/regexp/makefile.mk index 898a4d5adbdb..8d0b938402e8 100644 --- a/ucb/source/regexp/makefile.mk +++ b/ucb/source/regexp/makefile.mk @@ -36,8 +36,10 @@ AUTOSEG=true ENABLE_EXCEPTIONS=true .INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/regexp.obj +.ENDIF # L10N_framework .INCLUDE : target.mk diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk index cbe4e360ee29..bcd3b644476a 100644 --- a/ucb/source/sorter/makefile.mk +++ b/ucb/source/sorter/makefile.mk @@ -38,6 +38,7 @@ ENABLE_EXCEPTIONS=TRUE UCB_MAJOR=1 .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/sortdynres.obj \ @@ -60,6 +61,7 @@ SHL1IMPLIB=i$(TARGET) SHL1VERSIONMAP=exports.map DEF1NAME=$(SHL1TARGET) +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk index 03e0e5a638ee..6b4ffc8581be 100644 --- a/ucb/source/ucp/expand/makefile.mk +++ b/ucb/source/ucp/expand/makefile.mk @@ -39,6 +39,8 @@ NO_BSYMBOLIC = TRUE .INCLUDE : settings.mk DLLPRE = +.IF "$(L10N_framework)"=="" + SLOFILES= \ $(SLO)$/ucpexpand.obj @@ -58,4 +60,6 @@ SHL1DEF = $(MISC)$/$(SHL1TARGET).def DEF1NAME = $(SHL1TARGET) +.ENDIF # L10N_framework + .INCLUDE : target.mk diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk index 31fbaf8f1eba..d03983bca000 100644 --- a/ucb/source/ucp/file/makefile.mk +++ b/ucb/source/ucp/file/makefile.mk @@ -39,6 +39,7 @@ NO_BSYMBOLIC=TRUE UCPFILE_MAJOR=1 .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/prov.obj \ @@ -77,6 +78,7 @@ DEF1EXPORTFILE=exports2.dxp .ENDIF DEF1NAME=$(SHL1TARGET) +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk index 05254484eb0d..75f5512c728c 100644 --- a/ucb/source/ucp/ftp/makefile.mk +++ b/ucb/source/ucp/ftp/makefile.mk @@ -45,7 +45,7 @@ UCPFTP_MAJOR=1 .INCLUDE: settings.mk # --- General ----------------------------------------------------- - +.IF "$(L10N_framework)"=="" # first target ( shared library ) SLOFILES1=\ @@ -93,6 +93,7 @@ SHL1LIBS= \ DEF1NAME=$(SHL1TARGET) +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk index a0f33f8dbb6d..2e7009e52ab2 100644 --- a/ucb/source/ucp/gio/makefile.mk +++ b/ucb/source/ucp/gio/makefile.mk @@ -39,6 +39,7 @@ USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt @@ -79,5 +80,6 @@ SHL1STDLIBS+=$(PKGCONFIG_LIBS) SHL1VERSIONMAP= exports.map .ENDIF # "$(ENABLE_GIO)"!="" +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk index 0f7ae15db9d8..889e3ffd415d 100644 --- a/ucb/source/ucp/gvfs/makefile.mk +++ b/ucb/source/ucp/gvfs/makefile.mk @@ -39,6 +39,7 @@ USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt @@ -83,6 +84,7 @@ SHL1STDLIBS+=$(PKGCONFIG_LIBS) SHL1VERSIONMAP= exports.map .ENDIF # "$(ENABLE_GNOMEVFS)"!="" +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk index 9500b024829d..b71ee7fa1817 100644 --- a/ucb/source/ucp/hierarchy/makefile.mk +++ b/ucb/source/ucp/hierarchy/makefile.mk @@ -44,6 +44,7 @@ UCPHIER_MAJOR=1 .INCLUDE: settings.mk # --- General ----------------------------------------------------- +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/hierarchyservices.obj \ @@ -82,5 +83,6 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ---------------------------------------------------------- +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk index 64e76da3ea24..4b4f066ac1cf 100644 --- a/ucb/source/ucp/package/makefile.mk +++ b/ucb/source/ucp/package/makefile.mk @@ -50,6 +50,7 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk # --- General ----------------------------------------------------- +.IF "$(L10N_framework)"=="" SLOFILES=\ $(SLO)$/pkgservices.obj \ @@ -86,5 +87,6 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ---------------------------------------------------------- +.ENDIF # L10N_framework .INCLUDE: target.mk diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk index 78b3123fa220..1c2c44b124de 100644 --- a/ucb/source/ucp/tdoc/makefile.mk +++ b/ucb/source/ucp/tdoc/makefile.mk @@ -43,6 +43,7 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk # --- General ----------------------------------------------------- +.IF "$(L10N_framework)"=="" # no "lib" prefix DLLPRE = @@ -89,6 +90,8 @@ SYMBOLPREFIX=$(TARGET) DEF1NAME=$(SHL1TARGET) +.ENDIF # L10N_framework + # --- Targets ---------------------------------------------------------- .INCLUDE: target.mk diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 496b33b82220..c8891723cd2c 100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -50,6 +50,7 @@ NO_BSYMBOLIC=TRUE # --- Settings --------------------------------------------------------- .INCLUDE: settings.mk +.IF "$(L10N_framework)"=="" .IF "$(DISABLE_NEON)" == "TRUE" @@ -160,6 +161,7 @@ DEF1NAME=$(SHL1TARGET) .ENDIF #"$(DISABLE_NEON)" == "TRUE" +.ENDIF # L10N_framework # --- Targets ---------------------------------------------------------- .INCLUDE: target.mk |