diff options
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 79c159e6fb23..8c1ba38e17e7 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -59,19 +59,16 @@ INCPOST*=. ENVINCPRE+=-I$(PRE)$/inc .ENDIF # "$(PRE)"!="" .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" -UNOINCLUDES=-I$(SOLARINCDIR)$/offuh -.IF "$(BUILDSOLARINCDIR)"!="$(SOLARINCDIR)" -UNOINCLUDES+=-I$(BUILDSOLARINCDIR)$/offuh -.ENDIF # "$(BUILDSOLARINCDIR)"!="$(SOLARINCDIR)" +UNOINCLUDES=$(SOLARINCDIR)$/offuh .ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" SOLARINC+=$(JDKINCS) # make sure INCLUDE isn't set 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) $(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) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(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 @@ -220,9 +217,6 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i) NEWCLASS:=$(LOCALJARS) NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL))) -.IF "$(SOLARBINDIR)"!="$(BUILDSOLARBINDIR)" -NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(BUILDSOLARBINDIR)$/$i $(NULL))) -.ENDIF # "$(SOLARBINDIR)"!="$(BUILDSOLARBINDIR)" .ENDIF # "$(JARFILES)"!="" .IF "$(EXTRAJARFILES)"!="" NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i) |