diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-02-02 11:02:06 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-02-02 11:02:06 +0000 |
| commit | 13673f42a1c17d8cefdbcb7c7b2fcf6685298e61 (patch) | |
| tree | 56ffac35e6682209f8a1daec013c2c3dd66b7689 /solenv/inc/tg_obj.mk | |
| parent | 70c1c1115acbedada1fbb47f08e17815b74981c7 (diff) | |
fix for SECOND_BUILD
Diffstat (limited to 'solenv/inc/tg_obj.mk')
| -rw-r--r-- | solenv/inc/tg_obj.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index d16074f58417..8bffe361a153 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -72,24 +72,24 @@ $(SVXLIGHTOBJTARGET): $(REAL_SVXLIGHTOBJFILES) .IF "$(SECOND_BUILD)"!="" .IF "$($(SECOND_BUILD)OBJTARGET)"!="" -$($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)OBJFILES) +$($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) - +echo. $(foreach,i,$(REAL_$(SECOND_BUILD)OBJFILES:f) $(ROBJ)$/$(i)) >> $@ + +echo. $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" - +echo $(foreach,i,$(REAL_$(SECOND_BUILD)OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@ + +echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@ .ENDIF # "$(GUI)"=="UNX" .IF "$(GUI)"=="WIN" .IF "$(COM)"=="BLC" @+-$(RM) $@ >& $(NULLDEV) - $(LIBMGR) $@ $(LIBFLAGS) +$(REAL_$(SECOND_BUILD)OBJFILES:+"\n+":^"&") + $(LIBMGR) $@ $(LIBFLAGS) +$(REAL_$(SECOND_BUILD)_OBJFILES:+"\n+":^"&") .ELSE # "$(COM)"=="BLC" .ENDIF # "$(COM)"=="BLC" .ENDIF # "$(GUI)"=="WIN" |