summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-24 09:35:13 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-24 09:35:13 +0000
commitfb58b286f2477e83d59bae15280b25245f2c2def (patch)
treef8140c1c7874677e26bdd78213683c0cd6f098fb /scp2/source
parent9301a1aae4b22a3f92b4b9c74aff6df136044374 (diff)
INTEGRATION: CWS mergesvp (1.55.50); FILE MERGED
2007/06/27 12:02:31 pl 1.55.50.1: #i78931# libsvp changes
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/makefile.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 5704182d11d6..d2d4c8b70879 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.55 $
+# $Revision: 1.56 $
#
-# last change: $Author: ihi $ $Date: 2007-06-05 11:53:45 $
+# last change: $Author: rt $ $Date: 2007-07-24 10:35:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -79,10 +79,6 @@ SCPDEFS+=-DENABLE_SYSTRAY_GTK
SCPDEFS+=-DUSE_PASF
.ENDIF
-.IF "$(ENABLE_HEADLESS)" != ""
-SCPDEFS+=-DENABLE_HEADLESS
-.ENDIF
-
.IF "$(ENABLE_KDE)" != ""
SCPDEFS+=-DENABLE_KDE
.ENDIF
@@ -276,11 +272,9 @@ ULFFILES= \
module_systemint.ulf
.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_HEADLESS)" == "TRUE"
PARFILES+=module_headless.par
ULFFILES+=module_headless.ulf
.ENDIF
-.ENDIF
# --- File ---------------------------------------------------------
.INCLUDE : target.mk