libiconv-1.9.2-src.diff

libiconv是一个很不错的字符集转换库。程序接口也很简单

+extern LIBCHARSET_DLL_EXPORTED const char * locale_charset (void);
 
 
 #ifdef __cplusplus
diff -ipuwrN -x '*.bak' -x '*.orig' -x '*.rej' -x '*.new' libiconv-1.9.2-orig/libcharset/lib/Makefile.in libiconv-1.9.2-src/libcharset/lib/Makefile.in
--- libiconv-1.9.2-orig/libcharset/lib/Makefile.in	2003-04-14 15:51:06.000000000 +0200
+++ libiconv-1.9.2-src/libcharset/lib/Makefile.in	2004-10-14 00:01:43.546875000 +0200
@@ -4,6 +4,8 @@
 
 # Directories used by "make":
 srcdir = @srcdir@
+resdir = ../@top_builddir@res
+vpath %.rc ../@top_builddir@res
 
 # Directories used by "make install":
 prefix = @prefix@
@@ -15,17 +17,18 @@ libdir = @libdir@
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@	 -Wl,--major-image-version=$(MAJOR) -Wl,--minor-image-version=$(MINOR) 
 INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../include
 DEFS = -DLIBDIR=\"$(libdir)\" \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC \
 -Dset_relocation_prefix=libcharset_set_relocation_prefix \
--Drelocate=libcharset_relocate @DEFS@
+-Drelocate=libcharset_relocate @DEFS@ -DINSTALLDIR=\"$(prefix)/bin\" 
 LIBTOOL = @LIBTOOL@
 LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
 LIBTOOL_LINK = $(LIBTOOL) --mode=link
 LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
 LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
+RCTOOL_COMPILE = RCTOOL
 RM = rm -f
 
 # Programs used by "make install":
@@ -33,10 +36,16 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 mkinstalldirs = $(SHELL) @top_srcdir@/autoconf/mkinstalldirs
 
+# Rule to make compiled resource (Windows)
+%-rc.o: %.rc
+	windres --include-dir $(resdir) -i $< -o $@
+
 #### End of system configuration section. ####
 
 PACKAGE = @PACKAGE@
-VERSION = @VERSION@
+VERSION = 1.9
+MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
+MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
 
 SHELL = /bin/sh
 
@@ -50,18 +59,31 @@ top_builddir = ..
 SOURCES = $(srcdir)/localcharset.c $(srcdir)/relocatable.c
 
 OBJECTS = localcharset.lo relocatable.lo
+libcharset_dll_OBJECTS = $(OBJECTS:.lo=.o) libcharset-dllversion.o libcharset-dll-rc.o
 
-all : libcharset.la charset.alias ref-add.sed ref-del.sed
+all : libcharset.la libcharset.dll charset.alias ref-add.sed ref-del.sed
 
 libcharset.la : $(OBJECTS)
 	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
 
+libcharset.dll: libcharset.la libcharset-dllversion.lo libcharset-dll-rc.lo
+	cd .libs && o2dll -o libcharset.dll -l libcharset $(libcharset_dll_OBJECTS) $(LIBS)
+	cp -fp libcharset.la libcharset.la.orig
+	sed -e "s/libcharset.a/libcharset.dll.a/" libcharset.la.orig > libcharset.la
+	cp -fp .libs/libcharset*.dll $@
+
 localcharset.lo : $(srcdir)/localcharset.c
 	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
 
 relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
 	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
 
+libcharset-dllversion.lo: $(resdir)/libcharset-dllversion.c
+	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(resdir)/libcharset-dllversion.c
+
+libcharset-dll-rc.lo: $(resdir)/libcharset-dll.rc
+	$(RCTOOL_COMPILE) $(resdir)/libcharset-dll.rc
+
 charset.alias: $(srcdir)/config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
 	mv t-$@ $@
@@ -79,6 +101,9 @@ ref-del.sed : $(srcdir)/ref-del.sin
 install-lib : all force
 	$(mkinstalldirs) $(libdir)
 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
+	$(INSTALL_DATA) .libs/libcharset.lib $(DESTDIR)$(libdir)/libcharset.lib
+	$(INSTALL_DATA) .libs/libcharset-bcc.lib $(DESTDIR)$(libdir)/libcharset-bcc.lib
+	$(INSTALL_DATA) .libs/libcharset1.def $(DESTDIR)$(libdir)/libcharset1.def
 	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
 	                                || orig=charset.alias; \
 	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
@@ -95,6 +120,9 @@ install-lib : all force
 install : all force
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+	$(INSTALL_DATA) .libs/libcharset.lib $(DESTDIR)$(libdir)/libcharset.lib
+	$(INSTALL_DATA) .libs/libcharset-bcc.lib $(DESTDIR)$(libdir)/libcharset-bcc.lib
+	$(INSTALL_DATA) .libs/libcharset1.def $(DESTDIR)$(libdir)/libcharset1.def
 	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
 	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
diff -ipuwrN -x '*.bak' -x '*.orig' -x '*.rej' -x '*.new' libiconv-1.9.2-orig/src/Makefile.in libiconv-1.9.2-src/src/Makefile.in
--- libiconv-1.9.2-orig/src/Makefile.in	2003-06-24 12:39:55.000000000 +0200
+++ libiconv-1.9.2-src/src/Makefile.in	2004-10-13 23:49:27.015625000 +0200
@@ -5,6 +5,8 @@
 # Directories used by "make":
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+resdir = @top_builddir@res
+vpath %.rc @top_builddir@res
 
 # Directories used by "make install":
 prefix = @prefix@
@@ -19,7 +21,7 @@ localedir = $(datadir)/locale
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgw32c
 INCLUDES = -I. -I$(srcdir) -I.. -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib
 LIBTOOL = @LIBTOOL@
 LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
@@ -35,6 +37,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 mkinstalldirs = $(SHELL) @top_srcdir@/autoconf/mkinstalldirs
 
+# Rule to make compiled resource (Windows)
+%-rc.o: %.rc
+	windres --include-dir $(resdir) -i $< -o $@
+
 #### End of system configuration section. ####
 
 SHELL = /bin/sh
@@ -56,8 +62,8 @@ all : iconv_no_i18n iconv.@OBJEXT@
 	test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
 
 # This is the temporary iconv executable, without internationalization.
-iconv_no_i18n : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la
-	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv_no_i18n.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la -o $@
+iconv_no_i18n : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la iconv-rc.@OBJEXT@
+	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv_no_i18n.@OBJEXT@ iconv-rc.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la -o $@
 
 iconv_no_i18n.@OBJEXT@ : $(srcdir)/iconv_no_i18n.c $(srcdir)/iconv.c
 	$(CC) -c $(INCLUDES) -I../lib $(CFLAGS) $(CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" -DLOCALEDIR=\"$(localedir)\" $(srcdir)/iconv_no_i18n.c
@@ -92,7 +98,7 @@ install : all force
 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
 	case "@host_os@" in \
 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ iconv-rc.@OBJEXT@  ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -lgw32c -o iconv;; \
 	esac
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
 
diff -ipuwrN -x '*.bak' -x '*.orig' -x '*.rej' -x '*.new' libiconv-1.9.2-orig/srclib/Makefile.in libiconv-1.9.2-src/srclib/Makefile.in
--- libiconv-1.9.2-orig/srclib/Makefile.in	2003-07-02 12:34:18.000000000 +0200
+++ libiconv-1.9.2-src/srclib/Makefile.in	2004-10-02 21:11:47.890625000 +0200
@@ -16,6 +16,8 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+resdir = @top_builddir@res
+vpath %.rc @top_builddir@res
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -60,7 +62,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 
-DEFS = -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 @DEFS@
+DEFS = -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
@@ -81,14 +83,14 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@	-lgw32c
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LN = @LN@
-LN_S = @LN_S@
+LN = cp -fp
+LN_S = cp -fp
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -120,6 +122,8 @@ STRIP = @STRIP@
 USE_EXTRA_ENCODINGS = @USE_EXTRA_ENCODINGS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
+MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
 XGETTEXT = @XGETTEXT@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_AS = @ac_ct_AS@
@@ -230,7 +234,7 @@ am_libicrt_a_OBJECTS = error.$(OBJEXT) p
 	xreadlink.$(OBJEXT)
 libicrt_a_OBJECTS = $(am_libicrt_a_OBJECTS)
 
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/lib
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -268,6 +272,10 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+# Rule to make compiled resource (Windows)
+%-rc.o: %.rc
+	windres --include-dir $(resdir) -i $< -o $@
+
 .c.o:
 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
diff -ipuwrN -x '*.bak' -x '*.orig' -x '*.rej' -x '*.new' libiconv-1.9.2-orig/srclib/relocwrapper.c libiconv-1.9.2-src/srclib/relocwrapper.c
--- libiconv-1.9.2-orig/srclib/relocwrapper.c	2003-04-14 16:00:21.000000000 +0200
+++ libiconv-1.9.2-src/srclib/relocwrapper.c	2004-10-02 19:43:50.890625000 +0200
@@ -148,7 +148,14 @@ main (int argc, char *argv[])
   full_program_name = get_full_program_name ();
   if (full_program_name == NULL)
     full_program_name = argv[0];
-
+#ifdef __GW32__
+  {
+	char *short_full_program_name;
+	short_full_program_name = getshortpath (full_program_name);
+	free (full_program_name);
+	full_program_name = short_full_program_name;
+  }
+#endif
   /* Invoke the real program, with suffix ".bin".  */
   argv[0] = add_dotbin (full_program_name);
   relocate_libdirs ();