diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:59:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:59:13 +0000 |
| commit | 5636c4b577cf03207b63b90470a41732633a9fd6 (patch) | |
| tree | 63216b8fb6b5f3ceb8a733ac8c99d28c59730b44 /solenv/inc/tg_sdi.mk | |
| parent | ca78dee0a45ac1b3154e7de94bd5d75e3668eabe (diff) | |
INTEGRATION: CWS ause058 (1.12.10); FILE MERGED
2006/06/13 16:21:19 hjs 1.12.10.3: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006/06/09 15:11:03 hjs 1.12.10.2: #i65725# second round
2006/06/09 14:34:14 hjs 1.12.10.1: #i65725# first round
Diffstat (limited to 'solenv/inc/tg_sdi.mk')
| -rw-r--r-- | solenv/inc/tg_sdi.mk | 52 |
1 files changed, 3 insertions, 49 deletions
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk index f56c1d32743e..a345279fdbdc 100644 --- a/solenv/inc/tg_sdi.mk +++ b/solenv/inc/tg_sdi.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_sdi.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2006-05-24 13:13:09 $ +# last change: $Author: kz $ $Date: 2006-07-05 21:59:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -33,41 +33,10 @@ # #************************************************************************* - - -# ------------------ -# - SDITARGETS - -# ------------------ - -.IF "$(MULTI_SDI_FLAG)" == "" - -$(SDITARGET) .NULL : SDI0 - -$(SDI1TARGET) .NULL : SDI1 - -$(SDI2TARGET) .NULL : SDI2 - -$(SDI3TARGET) .NULL : SDI3 - -$(SDI4TARGET) .NULL : SDI4 - -$(SDI5TARGET) .NULL : SDI5 - -.ENDIF - - -.IF "$(MULTI_SDI_FLAG)" == "" -SDI0 SDI1 SDI2 SDI3 SDI4 SDI5 : - @+dmake $(SDI$(TNR)TARGET) $(HIDSID$(TNR)PARTICLE) MULTI_SDI_FLAG=true TNR:=$(TNR) $(MFLAGS) $(CALLMACROS) -.ELSE # "$(MULTI_SDI_FLAG)" == "" - - ####################################################### # instructions for ??? # unroll begin -.IF "$(make_srs_deps)"=="" - .IF "$(HIDSID$(TNR)PARTICLE)"!="" $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET) $(MISC)$/$(SDI$(TNR)NAME).sid @echo ------------------------------ @@ -95,25 +64,10 @@ $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi -fx$(SDI$(TNR)EXPORT).sdi \ -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 ) -.ENDIF # "$(SDI$(TNR)TARGET)"!="" - -.ELSE # "$(make_srs_deps)"=="" -.IF "$(SDI$(TNR)TARGET)"!="" -$(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) - @+echo jetzt nicht... + $(SDI$(TNR)NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE) -I$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc ) .ENDIF # "$(SDI$(TNR)TARGET)"!="" -.IF "$(HIDSID$(TNR)PARTICLE)"!="" -$(HIDSID$(TNR)PARTICLE): - @+echo jetzt nicht... -.ENDIF # "$(HIDSID$(TNR)PARTICLE)"!="" -.ENDIF # "$(make_srs_deps)"=="" - - # Instruction for ??? # unroll end ####################################################### -.ENDIF # "$(MULTI_SDI_FLAG)" == "" - |