From fae0614c3854ef4b5366f37179fa8e8e0fa5147f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 16 Jul 2008 16:54:29 +0200 Subject: [PATCH] Move -DENABLE_LAYOUT from stray makefiles to settings.mk. --- sc/source/ui/attrdlg/makefile.mk | 4 ---- sc/source/ui/dbgui/makefile.mk | 4 ---- sc/source/ui/miscdlgs/makefile.mk | 4 ---- sc/source/ui/view/makefile.mk | 4 ---- solenv/inc/settings.mk | 6 ++++++ svx/source/dialog/makefile.mk | 4 ---- svx/util/makefile.pmk | 6 ------ sw/source/ui/dialog/makefile.mk | 4 ---- toolkit/util/makefile.pmk | 4 +--- toolkit/workben/layout/makefile.mk | 2 -- 10 files changed, 7 insertions(+), 35 deletions(-) diff --git a/sc/source/ui/attrdlg/makefile.mk b/sc/source/ui/attrdlg/makefile.mk index ef2e92d..c557021 100644 --- a/sc/source/ui/attrdlg/makefile.mk +++ b/sc/source/ui/attrdlg/makefile.mk @@ -42,10 +42,6 @@ LIBTARGET=no .INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+= -DENABLE_LAYOUT=1 -.ENDIF # ENABLE_LAYOUT == TRUE - # --- Files -------------------------------------------------------- CXXFILES = attrdlg.cxx \ diff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mk index f42f46c..0a95138 100644 --- a/sc/source/ui/dbgui/makefile.mk +++ b/sc/source/ui/dbgui/makefile.mk @@ -42,10 +42,6 @@ LIBTARGET=no .INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+= -DENABLE_LAYOUT=1 -.ENDIF # ENABLE_LAYOUT == TRUE - # --- Files -------------------------------------------------------- SLOFILES = \ diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk index 588b38b..aac2608 100644 --- a/sc/source/ui/miscdlgs/makefile.mk +++ b/sc/source/ui/miscdlgs/makefile.mk @@ -42,10 +42,6 @@ LIBTARGET=no .INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+= -DENABLE_LAYOUT=1 -.ENDIF # ENABLE_LAYOUT == TRUE - # --- Files -------------------------------------------------------- SLOFILES = \ diff --git a/sc/source/ui/view/makefile.mk b/sc/source/ui/view/makefile.mk index e341120..48395f3 100644 --- a/sc/source/ui/view/makefile.mk +++ b/sc/source/ui/view/makefile.mk @@ -40,10 +40,6 @@ TARGET=view .INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+= -DENABLE_LAYOUT=1 -.ENDIF # ENABLE_LAYOUT == TRUE - # --- Files -------------------------------------------------------- # drawattr.cxx fuer IDL (enums), sollte in den Svx gehen?? diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9cf78b0..5d2a632 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1092,6 +1092,12 @@ LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON CDEFS+=-DGSTREAMER .ENDIF +.IF "$(ENABLE_LAYOUT)" == "TRUE" +CDEFS+=-DENABLE_LAYOUT=1 +.ELSE # ENABLE_LAYOUT != TRUE +CFLAGS+=-DENABLE_LAYOUT=0 +.ENDIF # ENABLE_LAYOUT != TRUE + # compose flags and defines for GUI .IF "$(TARGETTYPE)"=="GUI" CDEFS+= $(CDEFSGUI) diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index 06aaa90..247f726 100644 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk @@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc -.ENDIF # ENABLE_LAYOUT == TRUE - .IF "$(ENABLE_GTK)" != "" CFLAGS+=-DENABLE_GTK .ENDIF diff --git a/svx/util/makefile.pmk b/svx/util/makefile.pmk index 028a32e..4831744 100644 --- a/svx/util/makefile.pmk +++ b/svx/util/makefile.pmk @@ -36,12 +36,6 @@ CDEFS += -DSVX_DLLIMPLEMENTATION CFLAGS+=-DENABLE_GTK .ENDIF -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+=-DENABLE_LAYOUT=1 -.ELSE -CFLAGS+=-DENABLE_LAYOUT=0 -.ENDIF # ENABLE_LAYOUT == TRUE - # set default symbol visibility / scope to hidden .IF "$(COMNAME)" == "gcc3" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk index 1f16883..17ca965 100644 --- a/sw/source/ui/dialog/makefile.mk +++ b/sw/source/ui/dialog/makefile.mk @@ -42,10 +42,6 @@ LIBTARGET=no .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/inc$/sw.mk -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc -.ENDIF # ENABLE_LAYOUT == TRUE - # --- Files -------------------------------------------------------- SRS1NAME=$(TARGET) diff --git a/toolkit/util/makefile.pmk b/toolkit/util/makefile.pmk index f88a240..acf6ba4 100644 --- a/toolkit/util/makefile.pmk +++ b/toolkit/util/makefile.pmk @@ -41,7 +41,5 @@ CFLAGS += -xldscope=hidden CFLAGS+=-I$(PRJ)/inc/layout .IF "$(ENABLE_LAYOUT)" == "TRUE" -CFLAGS+=-DENABLE_LAYOUT=1 -DTEST_LAYOUT=1 -.ELSE -CFLAGS+=-DENABLE_LAYOUT=0 +CFLAGS+=-DTEST_LAYOUT=1 .ENDIF # ENABLE_LAYOUT == TRUE diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk index 2b2609c..3380cdc 100644 --- a/toolkit/workben/layout/makefile.mk +++ b/toolkit/workben/layout/makefile.mk @@ -51,8 +51,6 @@ CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../ .INCLUDE : $(PRJ)$/util$/makefile.pmk -CFLAGS += -DENABLE_LAYOUT=1 -DTEST_LAYOUT=1 - .IF "$(COMNAME)" == "gcc3" CFLAGS+=-Wall -Wno-non-virtual-dtor .ENDIF -- 1.5.6.3.317.g5d44c9.dirty