ooo-build r13908 - in trunk: . patches/dev300

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Sep 17 09:13:36 2008
New Revision: 13908
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13908&view=rev

Log:
2008-09-17  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-simple-dialogs-sfx2.diff: Do not build
	source/layout/ lib when --disable-layout.  Fixes non-layout
	build [at least] on MacOS X.  Thanks, Thorsten.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-simple-dialogs-sfx2.diff

Modified: trunk/patches/dev300/layout-simple-dialogs-sfx2.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-sfx2.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-sfx2.diff	Wed Sep 17 09:13:36 2008
@@ -766,10 +766,10 @@
 +END_NAMESPACE_LAYOUT_SFX_TABDIALOG
 diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
 new file mode 100644
-index 0000000..2ef1231
+index 0000000..eedce24
 --- /dev/null
 +++ sfx2/source/layout/makefile.mk
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,59 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -816,11 +816,15 @@
 +
 +# --- Files --------------------------------------------------------
 +
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
++
 +SLOFILES = \
 +	$(SLO)$/sfxtabpage.obj \
 +	$(SLO)$/sfxtabdialog.obj \
 +#
 +
++.ENDIF # ENABLE_LAYOUT == TRUE
++
 +# --- Tagets -------------------------------------------------------
 +
 +.INCLUDE :  target.mk
@@ -994,14 +998,17 @@
 +
 +} // end namespace layout
 diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
-index 3e08460..ec85e9e 100644
+index 3e08460..b987fae 100644
 --- sfx2/util/makefile.mk
 +++ sfx2/util/makefile.mk
-@@ -53,6 +53,7 @@ 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		\
+@@ -61,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