diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 15:13:33 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 15:13:33 +0000 |
| commit | 55841ee8c6dc89bb45779c835fd73c041724dc5a (patch) | |
| tree | d1815d7b9c02dfc1f857066caa074bf43f2b544e /solenv/inc/tg_sdi.mk | |
| parent | 108fbdaaacfd436061904b653cc8330eeb019e6f (diff) | |
INTEGRATION: CWS mergebuild (1.6.6); FILE MERGED
2004/05/12 13:38:14 hjs 1.6.6.4: #i8252# merge xrm; remove MISCX
2004/04/21 06:50:59 hjs 1.6.6.3: RESYNC: (1.7-1.8); FILE MERGED
2003/11/18 21:30:59 hjs 1.6.6.2: RESYNC: (1.6-1.7); FILE MERGED
2003/10/20 13:41:33 hjs 1.6.6.1: #111260# remove existing intermediates
Diffstat (limited to 'solenv/inc/tg_sdi.mk')
| -rw-r--r-- | solenv/inc/tg_sdi.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk index 6cdd778e029f..c9f257b47138 100644 --- a/solenv/inc/tg_sdi.mk +++ b/solenv/inc/tg_sdi.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_sdi.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: obo $ $Date: 2004-01-29 10:01:54 $ +# last change: $Author: hjs $ $Date: 2004-06-25 16:13:33 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -99,20 +99,21 @@ $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi $(SVIDL) @$(mktmp \ -fs$(INCCOMX)$/$(SDI$(TNR)NAME).hxx \ -fd$(INCCOMX)$/$(SDI$(TNR)NAME).ilb \ - -fm$(MISCX)$/$(SDI$(TNR)NAME).don \ + -fm$(MISC)$/$(SDI$(TNR)NAME).don \ -fl$(MISC)$/$(SDI$(TNR)NAME).lst \ -fx$(SDI$(TNR)EXPORT).sdi \ - -fy$(MISCX)$/xx$(PRJNAME).csv \ - -fz$(MISCX)$/$(SDI$(TNR)NAME).sid \ - $(SDI$(TNR)NAME).sdi -I$(MISCX) -I$(SVSDIINC) -I$(INC) -I$(INCLUDE) -I$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc ) + -fy$(MISC)$/xx$(PRJNAME).csv \ + -fz$(MISC)$/$(SDI$(TNR)NAME).sid \ + $(SDI$(TNR)NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) -I$(INCLUDE) -I$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc ) -$(HIDSID$(TNR)PARTICLE): $(MISCX)$/$(SDI$(TNR)NAME).sid +$(HIDSID$(TNR)PARTICLE): $(MISC)$/$(SDI$(TNR)NAME).sid @echo ------------------------------ @echo Making: $@ + @+-$(RM) $@.$(ROUT).tmp $@ .IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISCX)$/$(SDI$(TNR)NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp + @$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp .ELSE - @$(TYPE) $(MISCX)$/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp + @$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp .ENDIF @+-$(RM) $@ @+$(RENAME) $@.$(ROUT).tmp $@ |