diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:26:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:26:32 +0000 |
| commit | 6a684f5d06d54f52b876a94fe13722306efa399f (patch) | |
| tree | 90790657fa970fd8035feafe199e970157719015 /solenv/inc/settings.mk | |
| parent | ccc50f8a036670b6220332ff95bca8da85c2dd55 (diff) | |
INTEGRATION: CWS vgbugs06 (1.209.8); FILE MERGED
2007/05/04 14:49:24 vg 1.209.8.1: #i76771# makedepend with new include path, no -D_SOLAR__PRIVATE anymore
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 3fd88de364f6..ec3d3167e31a 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.212 $ +# $Revision: 1.213 $ # -# last change: $Author: rt $ $Date: 2007-04-26 13:56:54 $ +# last change: $Author: kz $ $Date: 2007-05-09 13:26:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -739,7 +739,7 @@ INCGUI=$(PRJ)$/$(GUIBASE)$/inc INCCOM=$(OUT)$/inc INCCOMX=$(OUT)$/inc INCUNOIDL=$(INCCOM)$/$(PRJNAME) -INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) +INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) $(INC)$/$(PRJNAME) .IF "$(PRJINC)"!="" INCLOCPRJ=$(foreach,i,$(PRJINC) $i$/inc) INCDEPN+=$(INCLOCPRJ) @@ -901,7 +901,7 @@ CDEFSDBGUTIL=-DDBG_UTIL CDEFSOPT=-DOPTIMIZE HDEFS=-D:$(GUI) -D:$(COM) -MKDEPFLAGS+=-D_SOLAR__PRIVATE -I$(INCDEPN:s/ / -I/:s/-I-I/-I/) +MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/) MKDEPALLINC=$(SOLARINC:s/-I/ -I/) MKDEPPREINC=-I$(PREPATH)$/$(INPATH)$/inc$(UPDMINOREXT) MKDEPSOLENV=-I$(SOLARENV)$/inc -I$(SOLARENV)$/$(GUI)$(CVER)$(COMEX)$/inc |