[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/_tg_app.mk |   20 ++++++++++----------
 solenv/inc/tg_app.mk  |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 10612ce9d23753e54bf6163499706970607830f3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 23 18:54:42 2011 +0300

    Migrate a /bin/echo change to _tg_app.mk back to tg_app.mk, and re-unroll

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index b92aa20..cf56b9c 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -60,7 +60,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
 $(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP1LIBS)"!=""
+.ENDIF          #"$(APP1LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls
@@ -272,7 +272,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
 $(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP2LIBS)"!=""
+.ENDIF          #"$(APP2LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls
@@ -484,7 +484,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
 $(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP3LIBS)"!=""
+.ENDIF          #"$(APP3LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls
@@ -696,7 +696,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
 $(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP4LIBS)"!=""
+.ENDIF          #"$(APP4LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls
@@ -908,7 +908,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
 $(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP5LIBS)"!=""
+.ENDIF          #"$(APP5LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls
@@ -1120,7 +1120,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
 $(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP6LIBS)"!=""
+.ENDIF          #"$(APP6LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls
@@ -1332,7 +1332,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
 $(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP7LIBS)"!=""
+.ENDIF          #"$(APP7LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls
@@ -1544,7 +1544,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
 $(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP8LIBS)"!=""
+.ENDIF          #"$(APP8LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls
@@ -1756,7 +1756,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
 $(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP9LIBS)"!=""
+.ENDIF          #"$(APP9LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls
@@ -1968,7 +1968,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
 $(MISC)/$(APP10TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
     sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP10LIBS)"!=""
+.ENDIF          #"$(APP10LIBS)"!="" 
 .ENDIF
 
 LINKINCTARGETS+=$(MISC)/$(APP10TARGETN:b)_linkinc.ls
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index fc1d724..cd9d444 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -111,7 +111,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
     `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    @/bin/echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
     $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
         `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \