merge commit

8 files changed, 21 insertions, 2 deletions

diff --git a/io/inc/makefile.mk b/io/inc/makefile.mk
index 7a15edc58216..ce9aa9036c6a 100644
--- a/io/inc/makefile.mk
+++ b/io/inc/makefile.mk
@@ -36,16 +36,18 @@ TARGET=inc
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-
+.IF "$(L10N_framework)"==""
 # --- Files --------------------------------------------------------
 # --- Targets -------------------------------------------------------
+.ENDIF 		# L10N_framework
 
 .INCLUDE :  target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(ENABLE_PCH)"!=""
 ALLTAR : \
     $(SLO)$/precompiled.pch \
     $(SLO)$/precompiled_ex.pch
     
 .ENDIF			# "$(ENABLE_PCH)"!=""
+.ENDIF 		# L10N_framework
 
diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk
index fcca36f0e576..1fb5aa33743a 100644
--- a/io/source/TextInputStream/makefile.mk
+++ b/io/source/TextInputStream/makefile.mk
@@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 DLLPRE =
 
 SLOFILES= \
@@ -59,5 +60,6 @@ SHL1RPATH=      URELIB
 DEF1NAME=		$(SHL1TARGET)
 
 # --- Targets ------------------------------------------------------
+.ENDIF 		# L10N_framework
 
 .INCLUDE :	target.mk
diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk
index 5359458ad8b4..7a4c0d6ba37f 100644
--- a/io/source/TextOutputStream/makefile.mk
+++ b/io/source/TextOutputStream/makefile.mk
@@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 DLLPRE =
 # ------------------------------------------------------------------
 
@@ -60,5 +61,6 @@ SHL1RPATH=      URELIB
 DEF1NAME=		$(SHL1TARGET)
 
 # --- Targets ------------------------------------------------------
+.ENDIF 		# L10N_framework
 
 .INCLUDE :	target.mk
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index b537b2087078..843f26296dae 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -40,6 +40,7 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 DLLPRE =
 # ------------------------------------------------------------------
 
@@ -71,4 +72,6 @@ SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 
 # --- Targets ------------------------------------------------------
+.ENDIF 		# L10N_framework
+
 .INCLUDE :	target.mk
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index d726ac4c87c7..471f6b9d258f 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -40,6 +40,7 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 DLLPRE =
 # ------------------------------------------------------------------
 
@@ -71,5 +72,6 @@ SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 
 # --- Targets ------------------------------------------------------
+.ENDIF 		# L10N_framework
 
 .INCLUDE :	target.mk
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index e4b8ad326b1d..43b6f2566ddf 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -32,6 +32,7 @@ PRJ=..$/..
 
 PRJNAME=io
 TARGET = streams.uno
+
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = stm
@@ -39,6 +40,7 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 DLLPRE =
 # --- Files --------------------------------------------------------
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
@@ -73,5 +75,7 @@ DEF1NAME=		$(SHL1TARGET)
 
 
 # --- Targets ------------------------------------------------------
+.ENDIF 		# L10N_framework
+
 .INCLUDE :	target.mk
 
diff --git a/io/test/makefile.mk b/io/test/makefile.mk
index af032ba8efb1..b7acf670684f 100644
--- a/io/test/makefile.mk
+++ b/io/test/makefile.mk
@@ -41,6 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 # --- Files --------------------------------------------------------
 
 OBJFILES=	$(OBJ)$/testcomponent.obj \
@@ -90,5 +91,6 @@ $(BIN)$/applicat.rdb: $(SOLARBINDIR)$/udkapi.rdb
     rm -f $@
     regmerge $@ / $?
 
+.ENDIF 		# L10N_framework
 
 .INCLUDE :  target.mk
diff --git a/io/test/stm/makefile.mk b/io/test/stm/makefile.mk
index cb5f6b0c803a..01d334edb998 100644
--- a/io/test/stm/makefile.mk
+++ b/io/test/stm/makefile.mk
@@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 # --- Files --------------------------------------------------------
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
@@ -97,5 +98,6 @@ DEF1EXPORTFILE=	exports.dxp
 
 
 # --- Targets ------------------------------------------------------
+.ENDIF 		# L10N_framework
 
 .INCLUDE :	target.mk