diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-07 14:31:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-07 14:31:13 +0000 |
| commit | 75c7a0730d3dc8f186c44921ad08fecac1839f60 (patch) | |
| tree | 20ee3bda6dce2d4eb0699b0525075e1c6eda1e8c /sfx2/source/appl/makefile.mk | |
| parent | 961c61cbd92ca36740d2f84f733e18438ae969cc (diff) | |
INTEGRATION: CWS gtkquickstart2 (1.44.18); FILE MERGED
2006/10/20 11:02:19 mmeeks 1.44.18.2: Issue: i#70644#
Disable quickstarter by default (Sun build), and add configure option to disable it too
2006/10/20 10:10:31 mmeeks 1.44.18.1: Issue number: i#70539#
Submitted by: mmeeks
Fix OSX build (really a tangled config_office issue)
Diffstat (limited to 'sfx2/source/appl/makefile.mk')
| -rw-r--r-- | sfx2/source/appl/makefile.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index 0ee26988c3b5..ce92dc15d75e 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.45 $ +# $Revision: 1.46 $ # -# last change: $Author: vg $ $Date: 2006-11-01 16:20:51 $ +# last change: $Author: kz $ $Date: 2006-11-07 15:31:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,13 +53,13 @@ CFLAGS+=-DENABLE_QUICKSTART_APPLET .IF "$(GUI)"=="UNX" CDEFS+=-DDLL_NAME=libsfx$(UPD)$(DLLPOSTFIX)$(DLLPOST) -.IF "$(ENABLE_GTK)" != "" +.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE" PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE: pkg_config.mk CFLAGS+=$(PKGCONFIG_CFLAGS) CFLAGS+=-DENABLE_QUICKSTART_APPLET CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(UPD)$(DLLPOSTFIX)$(DLLPOST) -.ENDIF # "$(ENABLE_QUICKSTART_APPLET)"=="TRUE" +.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE" .ELSE CDEFS+=-DDLL_NAME=sfx$(UPD)$(DLLPOSTFIX)$(DLLPOST) .ENDIF @@ -114,16 +114,14 @@ SFX_OBJECTS = \ $(SLO)$/modsizeexceeded.obj \ $(SLO)$/updatedlg.obj -.IF "$(GUI)"=="UNX" -QUICKSTART_OBJECTS = \ - $(SLO)$/shutdowniconunx.obj -.ENDIF - -SLOFILES = $(SFX_OBJECTS) $(QUICKSTART_OBJECTS) +SLOFILES = $(SFX_OBJECTS) LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1OBJFILES= $(SFX_OBJECTS) -.IF "$(GUI)"=="UNX" +.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE" +QUICKSTART_OBJECTS = $(SLO)$/shutdowniconunx.obj +SLOFILES += $(QUICKSTART_OBJECTS) + LIB2TARGET= $(SLB)$/quickstart.lib LIB2OBJFILES= $(QUICKSTART_OBJECTS) .ENDIF |