diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-10-25 12:57:29 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-10-25 12:57:29 +0000 |
commit | a64e74a1ec566e6bea89a50500b0ba18c9400337 (patch) | |
tree | 81752fd5b8f6e992fb2ffc6e0d5333ca05ad6968 /solenv/inc | |
parent | 1226bccd5e42a768efd6a9704f0361a28656110b (diff) |
#65293# remove faulty error messages
Diffstat (limited to 'solenv/inc')
-rw-r--r-- | solenv/inc/_tg_lib.mk | 40 | ||||
-rw-r--r-- | solenv/inc/tg_lib.mk | 4 | ||||
-rw-r--r-- | solenv/inc/tg_obj.mk | 6 | ||||
-rw-r--r-- | solenv/inc/tg_slo.mk | 10 |
4 files changed, 58 insertions, 2 deletions
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk index c40617e5ba93..025d4561e9e0 100644 --- a/solenv/inc/_tg_lib.mk +++ b/solenv/inc/_tg_lib.mk @@ -56,8 +56,12 @@ $(LIB1TARGET) : $(LIB1FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES)) +.IF "$(LIB1OBJFILES)"!="" @-+echo $(LIB1OBJFILES) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB1OBJFILES)"!="" +.IF "$(LIB1FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB1FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -127,8 +131,12 @@ $(LIB2TARGET) : $(LIB2FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES)) +.IF "$(LIB2OBJFILES)"!="" @-+echo $(LIB2OBJFILES) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB2OBJFILES)"!="" +.IF "$(LIB2FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB2FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -198,8 +206,12 @@ $(LIB3TARGET) : $(LIB3FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES)) +.IF "$(LIB3OBJFILES)"!="" @-+echo $(LIB3OBJFILES) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB3OBJFILES)"!="" +.IF "$(LIB3FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB3FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -269,8 +281,12 @@ $(LIB4TARGET) : $(LIB4FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES)) +.IF "$(LIB4OBJFILES)"!="" @-+echo $(LIB4OBJFILES) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB4OBJFILES)"!="" +.IF "$(LIB4FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB4FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -340,8 +356,12 @@ $(LIB5TARGET) : $(LIB5FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES)) +.IF "$(LIB5OBJFILES)"!="" @-+echo $(LIB5OBJFILES) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB5OBJFILES)"!="" +.IF "$(LIB5FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB5FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -411,8 +431,12 @@ $(LIB6TARGET) : $(LIB6FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES)) +.IF "$(LIB6OBJFILES)"!="" @-+echo $(LIB6OBJFILES) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB6OBJFILES)"!="" +.IF "$(LIB6FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB6FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -482,8 +506,12 @@ $(LIB7TARGET) : $(LIB7FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES)) +.IF "$(LIB7OBJFILES)"!="" @-+echo $(LIB7OBJFILES) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB7OBJFILES)"!="" +.IF "$(LIB7FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB7FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -553,8 +581,12 @@ $(LIB8TARGET) : $(LIB8FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES)) +.IF "$(LIB8OBJFILES)"!="" @-+echo $(LIB8OBJFILES) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB8OBJFILES)"!="" +.IF "$(LIB8FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB8FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -624,8 +656,12 @@ $(LIB9TARGET) : $(LIB9FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES)) +.IF "$(LIB9OBJFILES)"!="" @-+echo $(LIB9OBJFILES) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB9OBJFILES)"!="" +.IF "$(LIB9FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB9FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ @@ -695,8 +731,12 @@ $(LIB10TARGET) : $(LIB10FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES)) +.IF "$(LIB10OBJFILES)"!="" @-+echo $(LIB10OBJFILES) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB10OBJFILES)"!="" +.IF "$(LIB10FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB10FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk index 7e07e2ab9674..57917ea75a3a 100644 --- a/solenv/inc/tg_lib.mk +++ b/solenv/inc/tg_lib.mk @@ -90,8 +90,12 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES)) +.IF "$(LIB$(TNR)OBJFILES)"!="" @-+echo $(LIB$(TNR)OBJFILES) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) +.ENDIF # "$(LIB$(TNR)OBJFILES)"!="" +.IF "$(LIB$(TNR)FILES)"!="" @-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) +.ENDIF # "$(LIB$(TNR)FILES)"!="" @+echo. .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index 9c09c87e4840..40049a048323 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -10,7 +10,9 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) @+$(TYPE) $@ | tr -d \n\r > $@ @+echo. >> $@ .ELSE # "$(COM)"=="GCC" +.IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" @@ -29,7 +31,9 @@ $(SVXLIGHTOBJTARGET): $(REAL_SVXLIGHTOBJFILES) # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) +echo. $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i)) >> $@ .ELSE +.IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF .ENDIF # "$(GUI)"=="WNT" @@ -48,7 +52,9 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) +echo. $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) > $@ .ELSE +.IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF .ENDIF # "$(GUI)"=="WNT" diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk index 7b95e62baebf..933756d7587e 100644 --- a/solenv/inc/tg_slo.mk +++ b/solenv/inc/tg_slo.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_slo.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hjs $ $Date: 2001-10-23 15:07:29 $ +# last change: $Author: hjs $ $Date: 2001-10-25 13:57:28 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,7 +73,9 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES) @echo Making: $@ # @+$(RM) $@ .IF "$(GUI)"=="WNT" +.IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" @@ -93,7 +95,9 @@ $(SVXLIGHTSLOTARGET): $(REAL_SVXLIGHTSLOFILES) @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="WNT" +.IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" @@ -111,7 +115,9 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES) @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="WNT" +.IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) +.ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" |