summaryrefslogtreecommitdiff
path: root/extensions/source/nsplugin
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-12-10 17:01:52 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-12-10 17:01:52 +0000
commit5339ca2667ccfe056533d7f8f853b50f54e66065 (patch)
tree1ce267882078c506fb8359c422776145ca81cb40 /extensions/source/nsplugin
parent025f236afb0cd3cc37e29ff15da52890f1e69768 (diff)
INTEGRATION: CWS ause012 (1.4.10); FILE MERGED
2004/11/23 13:00:06 hjs 1.4.10.1: #i37698# survive ENABLE_GTK=
Diffstat (limited to 'extensions/source/nsplugin')
-rw-r--r--extensions/source/nsplugin/source/makefile.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 91d4adf7596d..ec2371012888 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: kz $ $Date: 2004-11-26 16:00:07 $
+# last change: $Author: hr $ $Date: 2004-12-10 18:01:52 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -72,11 +72,12 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GTK)" == ""
+.IF "$(ENABLE_GTK)"==""
dummy:
@echo GTK disabled - nothing to build
-.ENDIF
+
+.ELSE # "$(ENABLE_GTK)"==""
.IF "$(OS)"=="LINUX"
INC+= -DNP_LINUX
.ENDIF
@@ -87,6 +88,7 @@ CFLAGS+=$(PKGCONFIG_CFLAGS)
.IF "$(GUI)"=="WNT"
INC+= -DENGLISH
.ENDIF
+.ENDIF # "$(ENABLE_GTK)"==""
# --- Files -------------------------------------
SLOFILES= $(SLO)$/npshell.obj \