ooo-build r11228 - in trunk: . patches/src680

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Jan  9 10:17:51 2008
New Revision: 11228
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11228&view=rev

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

	* patches/src680/layout-dialogs-layout.diff[!ENABLE_LAYOUT]: Do
	not compile anything in layout/workben.  Works around Sun build
	problems.  Also remove more unnecessary unportable compiler flags
	in layout/workben.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-layout.diff

Modified: trunk/patches/src680/layout-dialogs-layout.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-layout.diff	(original)
+++ trunk/patches/src680/layout-dialogs-layout.diff	Wed Jan  9 10:17:51 2008
@@ -17579,10 +17579,10 @@
 +</dialog>
 diff --git a/layout/workben/makefile.mk b/layout/workben/makefile.mk
 new file mode 100644
-index 0000000..1d52964
+index 0000000..fb2b001
 --- /dev/null
 +++ layout/workben/makefile.mk
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,70 @@
 +PRJ=..
 +PRJNAME=layout
 +TARGET=test
@@ -17595,11 +17595,12 @@
 +# hack for now ...
 +CFLAGS += -I../source/core
 +CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc
-+CFLAGS += -DSHAREDLIB -D_DLL_ -fpic
 +CFLAGS += -DENABLE_LAYOUT=1 -DTEST_LAYOUT=1
 +
 +.INCLUDE : $(PRJ)$/util$/makefile.pmk
 +
++.IF "$(ENABLE_LAYOUT)"!=""
++
 +CXXFILES=\
 +	editor.cxx \
 +	wordcountdialog.cxx \
@@ -17612,6 +17613,8 @@
 +	$(OBJ)$/wordcountdialog.obj \
 +	$(OBJ)$/zoom.obj
 +
++.ENDIF # ENABLE_LAYOUT
++
 +APP1TARGET=$(TARGET)
 +APP1OBJS=$(OBJFILES)
 +# FIXME - review deps list ...