diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-08-07 13:04:44 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-08-07 13:04:44 +0000 |
| commit | c20a47fc2d8d93490b0adf6a8b7079f1aaf4710e (patch) | |
| tree | c9c3d9371101f8119c9aed921f3eaed3f380ee3a /solenv/inc/tg_obj.mk | |
| parent | c335ebb78f87c36a82476e9770f3955392a2e4dd (diff) | |
#8991# removed TF_ONE51 and TF_PACKAGES and connected lines
Diffstat (limited to 'solenv/inc/tg_obj.mk')
| -rw-r--r-- | solenv/inc/tg_obj.mk | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index 8bffe361a153..3923d51377e6 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -6,7 +6,6 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) @echo Making: $@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +echo. $(foreach,i,$(IDLOBJFILES:f) $(ROBJ)$/$(IDLPACKAGE)$/$(i)) > $@ +echo. $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) >> $@ @+$(TYPE) $@ | tr -d ï\n\rï > $@ @+echo. >> $@ @@ -15,29 +14,8 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" - +echo $(foreach,i,$(IDLOBJFILES:f) $(ROBJ)$/$(IDLPACKAGE)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ +echo $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@ .ENDIF # "$(GUI)"=="UNX" -.IF "$(GUI)"=="MAC" - +echo $(foreach,i,$(IDLOBJFILES:f) $(ROBJ)$/$(IDLPACKAGE)$/$(i)) | xargs -n1 > $@ - +echo $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) | xargs -n1 >> $@ -.ENDIF # "$(GUI)"=="MAC" -.IF "$(GUI)"=="WIN" - @+-$(RM) $@ >& $(NULLDEV) -.IF "$(COM)"=="BLC" - $(LIBMGR) $@ $(LIBFLAGS) +$(OBJFILES:+"\n+":^"&") -.ELSE # "$(COM)"=="BLC" -.ENDIF # "$(COM)"=="BLC" -.ENDIF # "$(GUI)"=="WIN" -.IF "$(GUI)"=="OS2" - @+-$(RM) $@ -.IF "$(COM)"=="ICC" - $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(&:+"&\n");) -.ELSE # "$(COM)"=="ICC" - $(LIBMGR) r $@ $(SLOFILES) -.ENDIF # "$(COM)"=="ICC" -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(OBJTARGET)"!="" @@ -56,18 +34,6 @@ $(SVXLIGHTOBJTARGET): $(REAL_SVXLIGHTOBJFILES) .IF "$(GUI)"=="UNX" +echo $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@ .ENDIF # "$(GUI)"=="UNX" -.IF "$(GUI)"=="WIN" -.IF "$(COM)"=="BLC" - @+-$(RM) $@ >& $(NULLDEV) - $(LIBMGR) $@ $(LIBFLAGS) +$(REAL_SVXLIGHTOBJFILES:+"\n+":^"&") -.ELSE # "$(COM)"=="BLC" -.ENDIF # "$(COM)"=="BLC" -.ENDIF # "$(GUI)"=="WIN" -.IF "$(GUI)"=="OS2" - @+-$(RM) $@ - $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(&:+"&\n");) -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(SVXLIGHTOBJTARGET)"!="" .IF "$(SECOND_BUILD)"!="" @@ -86,18 +52,6 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) .IF "$(GUI)"=="UNX" +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+":^"&") -.ELSE # "$(COM)"=="BLC" -.ENDIF # "$(COM)"=="BLC" -.ENDIF # "$(GUI)"=="WIN" -.IF "$(GUI)"=="OS2" - @+-$(RM) $@ - $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(&:+"&\n");) -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$($(SECOND_BUILD)OBJTARGET)"!="" .ENDIF # "$(SECOND_BUILD)"!="" |