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 /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 'Makefile')
| -rw-r--r-- | Makefile | 40 |
1 files changed, 21 insertions, 19 deletions
@@ -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 + |