summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-06-06 09:58:37 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-06-06 09:58:37 +0000
commit5d62cc4e3658425707caff56f47b18f46bf36e54 (patch)
tree64e3e5e5941526cfd803bb749dc6cab48fad979a
parent39f9cdd1f39a48557a0a836fc1622f40560292b3 (diff)
INTEGRATION: CWS ause080 (1.2.6); FILE MERGED
2007/06/05 10:48:22 hjs 1.2.6.1: #i78107# -Zd (line information only) and -clr (common runtime library) do not work together
-rw-r--r--cli_ure/source/uno_bridge/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk
index 7930126f1fea..d7b6d4cca459 100644
--- a/cli_ure/source/uno_bridge/makefile.mk
+++ b/cli_ure/source/uno_bridge/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: kz $ $Date: 2007-05-09 13:32:11 $
+# last change: $Author: ihi $ $Date: 2007-06-06 10:58:37 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -44,6 +44,7 @@ USE_DEFFILE = TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)" == "MSC10"