diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:26:32 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:26:32 +0000 |
| commit | d03e0c380472bcb80c5cb365f2763fad36f3bedf (patch) | |
| tree | e4e79caff80662369aea17c3716cfd8bf327a96f /shell | |
| parent | 378af917f9419db90b2f5c4088278bfa35b0bd40 (diff) | |
INTEGRATION: CWS sb60 (1.5.84); FILE MERGED
2006/07/24 15:04:32 sb 1.5.84.1: #b6448495# Replaced uri-encode awk script with C program, as awk (at least on Solaris) appears to pre-process non-ASCII bytes in its input.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/unix/misc/makefile.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index a5773d4f2b83..cba5fd33ce88 100644 --- a/shell/source/unix/misc/makefile.mk +++ b/shell/source/unix/misc/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-07 19:55:11 $ +# last change: $Author: ihi $ $Date: 2006-08-01 11:26:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -55,12 +55,6 @@ SCRIPTFILES = \ $(BIN)$/gnome-open-url \ $(BIN)$/kde-open-url -AWKFILES = \ - $(BIN)$/uri-encode - -OBJFILES = \ - $(OBJ)$/gnome-open-url.obj - APP1TARGET = gnome-open-url.bin APP1OBJS = \ $(OBJ)$/gnome-open-url.obj @@ -69,6 +63,13 @@ APP1LIBS = APP1STDLIBS=-ldl .ENDIF +APP2TARGET = uri-encode +APP2OBJS = $(OBJ)$/uri-encode.obj +APP2LIBS = +APP2STDLIBS = + +OBJFILES = $(APP1OBJS) $(APP2OBJS) + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk @@ -77,7 +78,3 @@ ALLTAR : $(SCRIPTFILES) $(AWKFILES) $(SCRIPTFILES) : $$(@:f:+".sh") +@tr -d "\015" < $(@:f:+".sh") > $@ - -$(AWKFILES) : $$(@:f:+".awk") - +@tr -d "\015" < $(@:f:+".awk") > $@ - |