summaryrefslogtreecommitdiff
path: root/forms/util/makefile.mk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2002-08-15 14:56:19 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2002-08-15 14:56:19 +0000
commit024e6bd991d219e363c83223158c0c768c3771bf (patch)
treee87700f4b039852bad13b9fe9c861eea40455d50 /forms/util/makefile.mk
parent55bca02a11a5b3ff71328d99bf0f1b7a69a134fc (diff)
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.4-1.4.10.1) -> HEAD
Diffstat (limited to 'forms/util/makefile.mk')
-rw-r--r--forms/util/makefile.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index fd60e95df3d7..000165bb3f67 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: pl $ $Date: 2001-10-24 17:00:56 $
+# last change: $Author: hr $ $Date: 2002-08-15 15:56:19 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -122,8 +122,17 @@ RESLIB1SRSFILES=$(RES1FILELIST)
.IF "$(GUI)"=="UNX"
+# [ed] 6/19/02 Only add in libraries for X11 OS X builds
+
+.IF "$(OS)"=="MACOSX"
+.IF "$(GUIBASE)"=="unx"
+SHL1STDLIBS +=\
+ -lX11 -lXt -lXmu
+.ENDIF
+.ELSE
SHL1STDLIBS +=\
-lX11
+.ENDIF # OS == MACOSX
.ENDIF