diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 13:59:17 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 13:59:17 +0000 |
commit | 3c4a9c8e03f93d6af63e3499edc386ba4f331674 (patch) | |
tree | 9852e085ee71a999fa83a1138ee8d26b2a793247 /shell | |
parent | 918ee44bb4a2575aed518921e1aaa7586194be66 (diff) |
INTEGRATION: CWS ucpgio1 (1.17.6); FILE MERGED
2008/04/30 16:56:13 cmc 1.17.6.1: #i88090# build gconfbe for gio content provider too
Diffstat (limited to 'shell')
-rw-r--r-- | shell/source/backends/gconfbe/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk index 32a2b91775..bbffc6b4b9 100644 --- a/shell/source/backends/gconfbe/makefile.mk +++ b/shell/source/backends/gconfbe/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # # This file is part of OpenOffice.org. # @@ -50,7 +50,7 @@ UCDSRCEXT = txt CFLAGS+=-DENABLE_LOCKDOWN .ENDIF -.IF "$(ENABLE_GNOMEVFS)"!="" +.IF "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" COMPILER_WARN_ALL=TRUE PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0 .INCLUDE: pkg_config.mk @@ -90,7 +90,7 @@ SHL1VERSIONMAP=exports.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -.ENDIF # "$(ENABLE_GNOMEVFS)"!="" +.ENDIF # "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" # --- Targets --- |