Fix most of the bugs that crept in.

test/GNU needs sorting out, as it's currently broken.

svn path=/trunk/iconv/; revision=6900

4 files changed, 32 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index c8bae83..e4ab0f9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,9 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
 	-I$(CURDIR)/src $(WARNFLAGS) 
 
 ifeq ($(TARGET),riscos)
-  LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/libro
+  LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/libro -lunicode
 else
-  LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/lib
+  LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/lib -lunicode
 endif
 
 include build/makefiles/Makefile.top
@@ -28,30 +28,32 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) /include/iconv:include/iconv/iconv.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
 INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
 
-ifeq ($(TARGET),riscos)
+ifeq ($(COMPONENT_TYPE),riscos-module)
   # And the RISC OS-specific targets
 
   DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) iconv.zip iconv-pkg.zip
 
   .PHONY: riscos-dist
 
+  # TODO: Make this sensible. Preferably by making use of the install target.
   riscos-dist: all
-	@svn export riscos riscos-dist
-	@$(CP) $(CPFLAGS) riscos/!Boot/Resources/!Unicode/Files/Aliases \
+	$(Q)svn export riscos riscos-dist
+	$(Q)$(CP) $(CPFLAGS) riscos/!Boot/Resources/!Unicode/Files/Aliases \
 			riscos-dist/!Boot/Resources/!Unicode/Files/
-	@$(CP) $(CPFLAGS) Iconv,ffa riscos-dist/!System/310/Modules/
-	@svn export doc riscos-dist/doc
-	@$(RM) $(RMFLAGS) -r riscos-dist/doc/Standards
-	@$(CP) $(CPFLAGS) include/iconv/iconv.h riscos-dist/stubs/
-	@(cd riscos-dist ; $(GCCSDK_INSTALL_ENV)/bin/zip -9r, ../iconv.zip *)
-	@$(MV) $(MVFLAGS) riscos-dist/!Boot/Resources riscos-dist
-	@$(RM) $(RMFLAGS) -r riscos-dist/!Boot
-	@$(MV) $(MVFLAGS) riscos-dist/!System riscos-dist/System
-	@$(RM) $(RMFLAGS) -r riscos-dist/doc riscos-dist/stubs 
-	@$(RM) $(RMFLAGS) riscos-dist/ReadMe
-	@svn export riscpkg/RiscPkg riscos-dist/RiscPkg
-	@$(CP) $(CPFLAGS) COPYING riscos-dist/RiscPkg/Copyright
-	@(cd riscos-dist ; $(GCCSDK_INSTALL_ENV)/bin/zip -9r, ../iconv-pkg.zip *)
-	@$(RM) $(RMFLAGS) -r riscos-dist
+	$(Q)$(CP) $(CPFLAGS) $(BUILDDIR)/iconv,ffa riscos-dist/!System/310/Modules/Iconv,ffa
+	$(Q)svn export doc riscos-dist/doc
+	$(Q)$(RM) $(RMFLAGS) -r riscos-dist/doc/Standards
+	$(Q)$(CP) $(CPFLAGS) include/iconv/iconv.h riscos-dist/stubs/
+	$(Q)(cd riscos-dist ; $(GCCSDK_INSTALL_ENV)/bin/zip -9r, ../iconv.zip *)
+	$(Q)$(MV) $(MVFLAGS) riscos-dist/!Boot/Resources riscos-dist
+	$(Q)$(RM) $(RMFLAGS) -r riscos-dist/!Boot
+	$(Q)$(MV) $(MVFLAGS) riscos-dist/!System riscos-dist/System
+	$(Q)$(RM) $(RMFLAGS) -r riscos-dist/doc riscos-dist/stubs 
+	$(Q)$(RM) $(RMFLAGS) riscos-dist/ReadMe
+	$(Q)svn export riscpkg/RiscPkg riscos-dist/RiscPkg
+	$(Q)$(CP) $(CPFLAGS) COPYING riscos-dist/RiscPkg/Copyright
+	$(Q)(cd riscos-dist ; $(GCCSDK_INSTALL_ENV)/bin/zip -9r, ../iconv-pkg.zip *)
+	$(Q)$(RM) $(RMFLAGS) -r riscos-dist
 
 endif
+
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
diff --git a/module/Makefile b/module/Makefile
index 04c515e..192774d 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -1,7 +1,5 @@
-ifeq ($(TARGET),riscos)
-  ifeq ($(COMPONENT_TYPE),binary)
-    DIR_SOURCES := header.cmhg module.c menu.c wrapper.c
-  endif 
+ifeq ($(COMPONENT_TYPE),riscos-module)
+  DIR_SOURCES := header.cmhg module.c menu.c wrapper.c
 endif
 
 include build/makefiles/Makefile.subdir
diff --git a/test/GNU/Makefile b/test/GNU/Makefile
index 75d893f..0a91e89 100644
--- a/test/GNU/Makefile
+++ b/test/GNU/Makefile
@@ -1,5 +1,6 @@
 # Tests
-DIR_TEST_ITEMS := table-from table-to genutf8 gengb18030z
+DIR_TEST_ITEMS := table-from:table-from.c table-to:table-to.c
+DIR_TEST_ITEMS := $(DIR_TEST_ITEMS) genutf8:genutf8.c gengb18030z:gengb18030z.c
 
 testGNU: $(DIR)
 	$(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ASCII