diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-04-13 13:29:53 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-04-13 13:29:53 +0000 |
| commit | bdf5ad46403aacb3adf6da0117319f477bb1bc4d (patch) | |
| tree | 51a8fd7bb99dd460cd31a1bceba79c279c2e6996 /solenv | |
| parent | 1fc006dca6105b4bfd84af584e0f54f33484c9fb (diff) | |
#i76340# no sal/inc/sal in INCLUDE
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/target.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 06aa2a8dd3d4..11bf48fabb50 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -4,9 +4,9 @@ # # $RCSfile: target.mk,v $ # -# $Revision: 1.194 $ +# $Revision: 1.195 $ # -# last change: $Author: vg $ $Date: 2007-04-11 19:47:41 $ +# last change: $Author: vg $ $Date: 2007-04-13 14:29:53 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,10 +61,13 @@ SOLARINC+=$(DAOINC) # make sure INCLUDE isn't set INCLUDE:= .EXPORT : INCLUDE +.IF "$(PRJNAME)"!="sal" +LOCALPRJINC=-I$(INC)$/$(PRJNAME) +.ENDIF .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC)$/$(PRJNAME) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) +INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) $(LOCALPRJINC) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC)$/$(PRJNAME) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) +INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) $(LOCALPRJINC) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) .ENDIF # "$(PRJINC)"!="" INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB |