diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-26 13:37:10 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-26 13:37:10 +0000 |
commit | 6acd64b847895b2aca81e5c1ed3138cb34a735a5 (patch) | |
tree | 9ad41bb67e6dc62a49432b38573622b04483e292 /aliases/Makefile | |
parent | c0c262e8c412b57a425d75b54dc3db668d39e058 (diff) | |
download | iconv-6acd64b847895b2aca81e5c1ed3138cb34a735a5.tar.gz iconv-6acd64b847895b2aca81e5c1ed3138cb34a735a5.tar.bz2 |
Fix most of the bugs that crept in.
test/GNU needs sorting out, as it's currently broken.
svn path=/trunk/iconv/; revision=6900
Diffstat (limited to 'aliases/Makefile')
-rw-r--r-- | aliases/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/aliases/Makefile b/aliases/Makefile index 2251de2..ab4a720 100644 --- a/aliases/Makefile +++ b/aliases/Makefile @@ -4,22 +4,22 @@ aliases_DATA := aliases-top character-sets aliases-bottom aliases := $(CURDIR)/riscos/!Boot/Resources/!Unicode/Files/Aliases -makealiases := $(addprefix $(BUILDDIR)/$(DIR), makealiases) +makealiases := $(addprefix $(BUILDDIR)/, \ + $(subst /,_,$(addprefix $(DIR),makealiases))) DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) $(aliases) -.PHONY: aliases - # Target for building aliases file -aliases: $(makealiases) $(addprefix $(DIR)data/, $(aliases_DATA)) - @$(makealiases) $(wordlist 2,$(words $^),$^) $(aliases) +$(aliases): $(makealiases) $(addprefix $(DIR)data/, $(aliases_DATA)) + $(VQ)$(ECHO) $(ECHOFLAGS) " ALIASES: $@" + $(Q)$(makealiases) $(wordlist 2,$(words $^),$^) $@ # Target for building makealiases binary $(makealiases): $(addprefix $(DIR), $(makealiases_SRCS)) - @$(HOST_CC) $(HOST_CCFLAGS) -o $@ $^ + $(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ $^ ifeq ($(MAKECMDGOALS),riscos-dist) - POST_TARGETS := $(POST_TARGETS) aliases + POST_TARGETS := $(POST_TARGETS) $(aliases) endif include build/makefiles/Makefile.subdir |