diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
| commit | 9232fb1123644f85b5f8dc00c9623ec32c38b69b (patch) | |
| tree | 436c9e5fde43a6a5b9a442b80ab2f4708f838c16 /solenv/inc/target.mk | |
| parent | 5468c694b9f87b60ed961ccff472131d14881189 (diff) | |
| parent | 3406b75aaec59100b015b9bcd2efe303f2a2f78b (diff) | |
merge DEV300_m70
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index eb4b35008e8a..2330aa64e49b 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -55,9 +55,6 @@ target_empty=warn_target_empty INCEXT*=. INCPRE*=. INCPOST*=. -.IF "$(PRE)"!="" -ENVINCPRE+=-I$(PRE)/inc -.ENDIF # "$(PRE)"!="" .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" UNOINCLUDES=$(SOLARINCDIR)/offuh .ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" @@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS) INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -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) +INCLUDE!:=-I. $(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) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(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 @@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L .IF "$(UNOTYPES)" != "" # makeing all in one .DIRCACHE=no -.IF "$(ENVINCPRE)"!="" -MKDEPFLAGS+=-I:$(ENVINCPRE) -.ENDIF # "$(ENVINCPRE))"!="" .IF "$(OBJFILES)"!="" $(OBJFILES) : $(UNOUCRTARGET) .ENDIF # "$(OBJFILES)"!="" |