diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 21:04:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 21:04:57 +0000 |
| commit | f033b6a895fcd26a300794fb69a69842294a0186 (patch) | |
| tree | be30e87eb30da9a5bbac28c6b5e90ff8f8277443 /solenv/inc/target.mk | |
| parent | f5477836089f753d698a457178313098ef7b5783 (diff) | |
INTEGRATION: CWS vgbugs07 (1.196.38); FILE MERGED
2007/06/06 10:20:11 vg 1.196.38.2: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007/06/04 13:31:57 vg 1.196.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 787d37fac7c4..834677e981f4 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -4,9 +4,9 @@ # # $RCSfile: target.mk,v $ # -# $Revision: 1.198 $ +# $Revision: 1.199 $ # -# last change: $Author: hr $ $Date: 2007-06-27 17:50:05 $ +# last change: $Author: hr $ $Date: 2007-06-27 22:04:57 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,13 +61,10 @@ 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) $(LOCALPRJINC) -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) -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) $(LOCALPRJINC) -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) -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 |