diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-17 12:27:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-17 12:27:19 +0000 |
| commit | 9c29fcfce7476d33822306c53152ebd6dfbe633c (patch) | |
| tree | 2044a3bb404b6d0a3372e5b566c77564e33a871a /solenv | |
| parent | 8dea6b5af2555539e171e92bd693c4ec94af3c1a (diff) | |
INTEGRATION: CWS ause078 (1.84.46); FILE MERGED
2007/03/22 18:04:17 hjs 1.84.46.1: #i75617# slow but safe
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/rules.mk | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index b7b1600253c3..97bfc7ff1257 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -4,9 +4,9 @@ # # $RCSfile: rules.mk,v $ # -# $Revision: 1.85 $ +# $Revision: 1.86 $ # -# last change: $Author: vg $ $Date: 2007-03-26 14:43:45 $ +# last change: $Author: rt $ $Date: 2007-04-17 13:27:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -354,11 +354,25 @@ not_existing$/s_%.dpcc : %.c;@noop $(assign all_local_slo+:=$<) not_existing$/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) $(MISC)$/%.dpslo : - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(all_local_slo) $(all_misc_slo)) > $@ +# faster but unusable with current source (e.g. external include guards) +# $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(all_local_slo) $(all_misc_slo)) > $@ +# slower but with correct output + @@$(RM) $@ + @$(TOUCH) $@ + @$(foreach,i,$(all_local_slo) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) + @$(foreach,i,$(all_misc_slo) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) +# for both $(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".obj") $@ : $(SLO)$/$(i:+"\n")) $(foreach,i,$(all_misc_slo:b:+".obj") $@ : $(SLO)$/$(i:+"\n"))) >> $@ $(MISC)$/%.dpobj : - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(all_local_obj) $(all_misc_obj)) > $@ +# faster but unusable with current source (e.g. external include guards) +# $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(all_local_obj) $(all_misc_obj)) > $@ +# slower but with correct output + @@$(RM) $@ + @$(TOUCH) $@ + @$(foreach,i,$(all_local_obj) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) + @$(foreach,i,$(all_misc_obj) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) +# for both $(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".obj") $@ : $(OBJ)$/$(i:+"\n")) $(foreach,i,$(all_misc_obj:b:+".obj") $@ : $(OBJ)$/$(i:+"\n"))) >> $@ # see also %.dpslo |