Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap

12 files changed, 21 insertions, 69 deletions

diff --git a/configure.in b/configure.in
index 623573f80bb7..82b241fc934d 100755
--- a/configure.in
+++ b/configure.in
@@ -221,9 +221,6 @@ AC_ARG_ENABLE(symbols,
         [Include debugging symbols in output. WARNING - a complete build needs
          8 Gb of space and takes much longer (enables -g compiler flag).])
     [
-                          --enable-symbols=SMALL
-                                     sets the gcc -g1 setting which is smaller.
-
                           Enabling symbols disables the stripping of the solver
                           (--disable-strip-solver).
     ],
@@ -1647,13 +1644,8 @@ dnl whether to include symbols into final build.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include symbols])
 if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-    if test "$enable_symbols" = "small" -o "$enable_symbols" = "SMALL"; then
-       ENABLE_SYMBOLS="SMALL"
-       AC_MSG_RESULT([yes, small])
-    else
-       ENABLE_SYMBOLS="TRUE"
-       AC_MSG_RESULT([yes])
-    fi
+   ENABLE_SYMBOLS="TRUE"
+   AC_MSG_RESULT([yes])
 else
    ENABLE_SYMBOLS=
    AC_MSG_RESULT([no])
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 3f1c56a4a56d..d478d07e4b02 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -302,7 +302,7 @@ $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
     @$(COPY) $< $@
 .ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
 
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand$/intro.zip
+$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
     $(COPY) $< $@
 
 $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e70da019dc90..3bf0366c6313 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -514,6 +514,8 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
+#if defined UNX && ! defined MACOSX
+
 File gid_File_Bin_QStart_Bin
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -521,6 +523,8 @@ File gid_File_Bin_QStart_Bin
     Name = "oosplash.bin";
 End
 
+#endif
+
 // use this for high detail file open dialog >= 5.1 windows
 #ifdef WNT
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 035ab2cccaa2..65769d268113 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -108,7 +108,7 @@ File gid_File_Basic_Tutorials
     Name = "basicsrvtutorials.zip";
 End
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Bin_Pagein
     BIN_FILE_BODY;
@@ -1286,7 +1286,7 @@ End
 
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Txt_Pagein_Calc
     TXT_FILE_BODY;
@@ -1295,10 +1295,6 @@ File gid_File_Txt_Pagein_Calc
     Name = "pagein-calc";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Common
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1306,10 +1302,6 @@ File gid_File_Txt_Pagein_Common
     Name = "pagein-common";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Draw
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1317,10 +1309,6 @@ File gid_File_Txt_Pagein_Draw
     Name = "pagein-draw";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Impress
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1328,10 +1316,6 @@ File gid_File_Txt_Pagein_Impress
     Name = "pagein-impress";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Writer
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8e0ff767d6ba..0c9896e5a1ed 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -81,7 +81,7 @@ gb_PRODUCT := $(false)
 endif
 endif
 
-ifneq ($(strip $(SYMBOL)$(symbol)$(SYMBOLS)$(symbols)),)
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
 gb_SYMBOL := $(true)
 else
 gb_SYMBOL := $(false)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 7632745ff083..718da7f2539d 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -60,6 +60,7 @@ gb_COMPILERDEFS := \
 	-D_CRT_NONSTDC_NO_DEPRECATE \
 	-D_CRT_SECURE_NO_DEPRECATE \
 	-D_MT \
+	-D_DLL \
 	-DBOOST_MEM_FN_ENABLE_CDECL \
 	-DCPPU_ENV=msci \
 	-DFULL_DESK \
@@ -73,6 +74,7 @@ gb_CFLAGS := \
 	-Gs \
 	-GS \
 	-Gy \
+	-MD \
 	-nologo \
 	-Wall \
 	-wd4005 \
@@ -120,6 +122,7 @@ gb_CXXFLAGS := \
 	-Gs \
 	-GS \
 	-Gy \
+	-MD \
 	-nologo \
 	-Wall \
 	-wd4005 \
@@ -162,10 +165,6 @@ gb_CXXFLAGS := \
 
 gb_STDLIBS := \
 	uwinapi \
-	kernel32 \
-	msvcrt \
-	msvcprt \
-	oldnames \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -WX
@@ -186,7 +185,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
 	-MACHINE:IX86 \
-	-NODEFAULTLIB \
 	-OPT:NOREF \
 	-SUBSYSTEM:CONSOLE \
 	-safeseh \
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index 08641adf69e1..f0b5765dc43f 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -59,12 +59,8 @@ CC*=gcc
 # flags for C and C++ Compiler
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxbsdi3.mk b/solenv/inc/unxbsdi3.mk
index 872c34745bb0..e05a02b8b512 100644
--- a/solenv/inc/unxbsdi3.mk
+++ b/solenv/inc/unxbsdi3.mk
@@ -48,12 +48,8 @@ CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
 CFLAGSOPT=                                     # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxbsdx3.mk b/solenv/inc/unxbsdx3.mk
index 986cd42665eb..254a3f6b868f 100644
--- a/solenv/inc/unxbsdx3.mk
+++ b/solenv/inc/unxbsdx3.mk
@@ -48,12 +48,8 @@ CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
 CFLAGSOPT=                                     # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index e22499adb074..f751384c4bb8 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -74,13 +74,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index e5cd92055225..b2e22b9e4920 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -72,13 +72,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 7c7f0a88f4f4..ed048403c2a3 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -42,12 +42,8 @@ CXXCPP*:=g++ -E $(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
 
-# flags to enable build with symbols; required by crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk