[ooo-build-commit] Branch 'ooo/master' - dbaccess/source dbaccess/util reportdesign/util

[Jan Holesovsky]

 dbaccess/source/ui/dlg/makefile.mk |    5 ++++-
 dbaccess/util/makefile.mk          |   12 ++++++++++--
 reportdesign/util/makefile.mk      |   14 +++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

New commits:
commit 299879c8ea863b19e1bb2aecdd3d49b69036d0a1
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Sep 16 11:45:54 2009 +0000

    CWS-TOOLING: integrate CWS l10nframework01

diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index af576ec..ca20987 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -55,6 +55,9 @@ CFLAGS+=-fpermissive
 
 # ... resource files ............................
 
+
+LOCALIZE_ME=AutoControls_tmpl.hrc
+
 SRS1NAME=$(TARGET)
 SRC1FILES =	\
         AutoControls.src	\
@@ -138,7 +141,7 @@ SLOFILES+=		$(SLO)$/adodatalinks.obj
 .ENDIF
 
 # --- Targets ----------------------------------
-LOCALIZE_ME=AutoControls_tmpl.hrc
+#LOCALIZE_ME=AutoControls_tmpl.hrc
 
 .INCLUDE : target.mk
 
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index cb276b7..7b69099 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -45,7 +45,7 @@ GEN_HID_OTHER=TRUE
 LDUMP=ldump2.exe
 
 # --- database core (dba) -----------------------------------
-
+.IF "$(L10N_framework)"==""
 LIB1TARGET=$(SLB)$/$(TARGET).lib
 LIB1FILES=\
         $(SLB)$/api.lib	\
@@ -84,6 +84,7 @@ DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
 # SHL1VERSIONMAP=$(TARGET).map
 SHL1USE_EXPORTS=name
 
+.ENDIF
 # --- .res file ----------------------------------------------------------
 
 RES1FILELIST=\
@@ -94,6 +95,7 @@ RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES=$(RES1FILELIST)
 
 # --- database ui (dbu) -----------------------------------
+.IF "$(L10N_framework)"==""
 
 LIB2TARGET=$(SLB)$/$(TARGET2).lib
 LIB2FILES=\
@@ -160,6 +162,7 @@ ALL: \
     $(LIB2TARGET)	\
     ALLTAR
 
+.ENDIF
 # --- .res file ----------------------------------------------------------
 
 RES2FILELIST=\
@@ -186,7 +189,7 @@ RESLIB2IMAGES=$(PRJ)$/res
 RESLIB2SRSFILES=$(RES2FILELIST)
 
 # --- database tools (sdbt) -----------------------------------
-
+.IF "$(L10N_framework)"==""
 LIB3TARGET=$(SLB)$/$(TARGET3).lib
 LIB3FILES=\
         $(SLB)$/conntools.lib \
@@ -209,6 +212,8 @@ SHL3DEF=$(MISC)$/$(SHL3TARGET).def
 DEF3NAME=$(SHL3TARGET)
 SHL3VERSIONMAP=$(TARGET3).map
 
+.END
+
 # --- .res file ----------------------------------------------------------
 
 RES3FILELIST=\
@@ -223,6 +228,8 @@ RESLIB3SRSFILES=$(RES3FILELIST)
 .INCLUDE : target.mk
 .IF "$(depend)"==""
 
+.IF "$(L10N_framework)"==""
+
 $(MISC)$/$(SHL2TARGET).flt: makefile.mk
     @echo ------------------------------
     @echo CLEAR_THE_FILE	> $@
@@ -236,3 +243,4 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo _real				>>$@
 .ENDIF
 
+.ENDIF
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index e062cae..cffe4ac 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -40,6 +40,8 @@ GEN_HID_OTHER=TRUE
 # --- Settings ----------------------------------
 .INCLUDE :  settings.mk
 
+.IF "$(L10N_framework)"==""
+
 # ------------------------------------------------------------------
 # --- reportdesign core (rpt) -----------------------------------
 
@@ -89,7 +91,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
 DEFLIB1NAME=$(TARGET)
-
+.ENDIF
 # --- .res file ----------------------------------------------------------
 
 RES1FILELIST=\
@@ -99,7 +101,7 @@ RESLIB1NAME=$(TARGET)
 RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES=$(RES1FILELIST)
 
-
+.IF "$(L10N_framework)"==""
 # --- reportdesign UI core (rptui) -----------------------------------
 LIB2TARGET=$(SLB)$/$(TARGET2).lib
 LIB2FILES=\
@@ -164,18 +166,17 @@ SHL2LIBS=$(LIB2TARGET)
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=$(SHL2TARGET)
 SHL2VERSIONMAP=$(TARGET2).map
-
+.ENDIF
 # --- .res file ----------------------------------------------------------
-
 RES2FILELIST=\
     $(SRS)$/uidlg.srs				\
     $(SRS)$/ui_inspection.srs		\
     $(SRS)$/report.srs
 
-
 RESLIB2NAME=$(TARGET2)
 RESLIB2IMAGES=$(PRJ)$/res
 RESLIB2SRSFILES=$(RES2FILELIST)
+.IF "$(L10N_framework)"==""
 
 # ------------------- rptxml -------------------
 TARGET3=rptxml
@@ -223,7 +224,10 @@ SHL3DEF=	$(MISC)$/$(SHL3TARGET).def
 
 DEF3NAME=$(SHL3TARGET)
 
+.ENDIF
+
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
 
+