diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 13:30:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 13:30:40 +0000 |
| commit | 2130ab0b24d0b8dcd0e3d154c0f87977d8a08770 (patch) | |
| tree | 25c89f8d86837a2c657d3f296b0e6b172897c61f /cpputools | |
| parent | 6de41a02c1e1c137661d95662264e97cc534bcc7 (diff) | |
INTEGRATION: CWS ause043 (1.12.6); FILE MERGED
2005/11/15 16:14:28 hjs 1.12.6.2: #i56702# set NO_OFFUH to check for completeness
2005/11/03 16:08:21 hjs 1.12.6.1: #i56702# remove overrides for default uno header generation
Diffstat (limited to 'cpputools')
| -rw-r--r-- | cpputools/source/unoexe/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk index d6e3f3fbf979..d5b6b8047e77 100644 --- a/cpputools/source/unoexe/makefile.mk +++ b/cpputools/source/unoexe/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: rt $ $Date: 2005-09-08 09:39:36 $ +# last change: $Author: vg $ $Date: 2006-05-24 14:30:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -38,7 +38,6 @@ PRJNAME=cpputools TARGET=uno LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE .IF "$(OS)" == "LINUX" LINKFLAGSRUNPATH = -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' @@ -53,8 +52,7 @@ LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\' UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb -UNOUCROUT = $(OUT)$/inc$/$(TARGET) -INCPRE += $(UNOUCROUT) +NO_OFFUH=TRUE CPPUMAKERFLAGS+= -C UNOTYPES= \ |