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
This commit is contained in:
parent
6de41a02c1
commit
2130ab0b24
1 changed files with 3 additions and 5 deletions
|
@ -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= \
|
||||
|
|
Loading…
Reference in a new issue