ooo-build r13900 - in trunk: . patches/test

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Sep 16 16:54:50 2008
New Revision: 13900
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13900&view=rev

Log:
    * patches/test/macbuild.diff: added janneke's layout disabling
    temporarily



Modified:
   trunk/ChangeLog
   trunk/patches/test/macbuild.diff

Modified: trunk/patches/test/macbuild.diff
==============================================================================
--- trunk/patches/test/macbuild.diff	(original)
+++ trunk/patches/test/macbuild.diff	Tue Sep 16 16:54:50 2008
@@ -71,3 +71,46 @@
  if test "z$with_gnu_cp" != "z"; then
      if test "z${with_gnu_cp%%/*}" = "z" ; then
  	# it's an absolute path
+diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
+index 2ef1231..eedce24 100644
+--- sfx2/source/layout/makefile.mk
++++ sfx2/source/layout/makefile.mk
+@@ -44,11 +44,15 @@ CFLAGS += -I../$(PRJ)/toolkit/source/vclcompat
+ 
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
++
+ SLOFILES = \
+ 	$(SLO)$/sfxtabpage.obj \
+ 	$(SLO)$/sfxtabdialog.obj \
+ #
+ 
++.ENDIF # ENABLE_LAYOUT == TRUE
++
+ # --- Tagets -------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
+index ec85e9e..b987fae 100644
+--- sfx2/util/makefile.mk
++++ sfx2/util/makefile.mk
+@@ -53,7 +53,6 @@ LIB1FILES=  $(SLB)$/appl.lib		\
+             $(SLB)$/view.lib		\
+             $(SLB)$/control.lib		\
+             $(SLB)$/notify.lib		\
+-            $(SLB)$/layout.lib		\
+             $(SLB)$/menu.lib		\
+             $(SLB)$/inet.lib		\
+             $(SLB)$/toolbox.lib		\
+@@ -62,6 +61,10 @@ LIB1FILES=  $(SLB)$/appl.lib		\
+             $(SLB)$/bastyp.lib		\
+             $(SLB)$/config.lib
+ 
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
++LIB1FILES += $(SLB)$/layout.lib
++.ENDIF # ENABLE_LAYOUT == TRUE
++
+ HELPIDFILES=\
+ 			..\inc\sfx2\sfxsids.hrc	\
+ 			..\source\inc\helpid.hrc