strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause043 (1.160.2); FILE MERGED

Browse source 
2006/05/15 14:22:54 hjs 1.160.2.5: RESYNC: (1.162-1.167); FILE MERGED
2005/12/22 13:54:30 hjs 1.160.2.4: RESYNC: (1.160-1.162); FILE MERGED
2005/11/15 16:19:35 hjs 1.160.2.3: #i56702# simplify check for adding offuh subdir to includes
2005/10/31 16:54:38 hjs 1.160.2.2: #i56702# handle the various ways NOT to declare a bootstrap service
2005/10/31 16:39:15 hjs 1.160.2.1: #i56702# hide offuh header from bootstrap components
This commit is contained in:
Vladimir Glazounov 2006-05-24 13:15:26 +00:00
parent 68eb0a8533
commit 63e14deb44
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
solenv/inc/target.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: target.mk,v $
#
# $Revision: 1.169 $
# $Revision: 1.170 $
#
# last change: $Author: vg $ $Date: 2006-05-24 13:12:42 $
# last change: $Author: vg $ $Date: 2006-05-24 14:15:26 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -51,6 +51,9 @@ INCPOST*=.
.IF "$(PRE)"!=""
ENVINCPRE+=-I$(PRE)$/inc
.ENDIF # "$(PRE)"!=""
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
UNOINCLUDES=$(SOLARINCDIR)$/offuh
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
.IF "$(LOCAL_SOLENV)"!=""
SOLARINC+=$(JDKINCS)
SOLARINC+=$(ORCLINC)
@ -58,9 +61,9 @@ SOLARINC+=$(DB2INC)
SOLARINC+=$(DAOINC)
.ENDIF "$(LOCAL_SOLENV)"!=""
.IF "$(PRJINC)"!=""
INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -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$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
.ELSE # "$(PRJINC)"!=""
INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
.ENDIF # "$(PRJINC)"!=""
.EXPORT : LIB
# --- Compiler -----------------------------------------------------
@ -1848,7 +1851,9 @@ TARGETDEPS+=$(EXCEPTIONSTARGET)
.ENDIF
# -Gc breaks the dependency chain and causes indefinite nummbers of $(CPPUMAKER)
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE"
CPPUMAKERFLAGS*=-L
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE"
.IF "$(UNOTYPES)" != ""
# makeing all in one