Fix the handling of Windows resources in shared libraries.

Author: bhaible

ChangeLog

@@ -1,3 +1,14 @@
+2009-03-25  Bruno Haible  <bruno@clisp.org>
+
+	Fix the handling of Windows resources in shared libraries.
+	* configure.ac: Invoke LT_LANG for 'WIndows Resource'.
+	* lib/Makefile.in (RC): New variable.
+	(WINDRES): Remove variable.
+	(OBJECTS_RES_yes): Add .lo suffix.
+	(libiconv.res.lo): Renamed from libiconv.res. Use libtool --tag=RC.
+	(clean): Simplify.
+	Based on a patch by Roumen Petrov <bugtrack@roumenpetrov.info>.
+
 2009-03-14  Bruno Haible  <bruno@clisp.org>
 
 	* autogen.sh: Checkout gnulib using 'git' instead of 'cvs'.

configure.ac

@@ -78,6 +78,11 @@ AC_EXEEXT
 dnl           check for build configuration
 
 LT_INIT([disable-static win32-dll])
+
+dnl Prepares the libtool configuration for handling of Windows resources, and
+dnl sets the RC variable to a program that compiles Windows resource files.
+LT_LANG([Windows Resource])
+
 gl_VISIBILITY
 AM_ICONV
 AM_GNU_GETTEXT([external], [need-ngettext])
@@ -168,7 +173,7 @@ fi
 AC_SUBST([DLL_VARIABLE])
 
 dnl On mingw and Cygwin, we can activate special Makefile rules which add
-dnl version information to the shared libraries and executables.
+dnl version information to the executables.
 case "$host_os" in
   mingw* | cygwin*) is_woe32=yes ;;
   *) is_woe32=no ;;

lib/Makefile.in

@@ -30,7 +30,8 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
 LIBTOOL_LINK = $(LIBTOOL) --mode=link
 LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
 LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
-WINDRES = @WINDRES@
+# Windows resource compiler (windres). Used via libtool.
+RC = @RC@
 CP = cp
 MV = mv
 LN = @LN@
@@ -61,7 +62,7 @@ SOURCES = $(srcdir)/iconv.c $(srcdir)/../libcharset/lib/localcharset.c $(srcdir)
 OBJECTS = iconv.lo localcharset.lo relocatable.lo $(OBJECTS_EXP_@WOE32DLL@) $(OBJECTS_RES_@WOE32@)
 OBJECTS_EXP_yes = iconv-exports.lo
 OBJECTS_EXP_no =
-OBJECTS_RES_yes = libiconv.res
+OBJECTS_RES_yes = libiconv.res.lo
 OBJECTS_RES_no =
 
 all : libiconv.la
@@ -88,8 +89,8 @@ relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
 iconv-exports.lo : $(srcdir)/../woe32dll/iconv-exports.c
 	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/../woe32dll/iconv-exports.c
 
-libiconv.res : $(srcdir)/../windows/libiconv.rc
-	$(WINDRES) `$(SHELL) $(srcdir)/../windows/windres-options --escape $(PACKAGE_VERSION)` -i $(srcdir)/../windows/libiconv.rc -o libiconv.res --output-format=coff
+libiconv.res.lo : $(srcdir)/../windows/libiconv.rc
+	$(LIBTOOL_COMPILE) --tag=RC $(RC) `$(SHELL) $(srcdir)/../windows/windres-options --escape $(PACKAGE_VERSION)` -i $(srcdir)/../windows/libiconv.rc -o libiconv.res.lo --output-format=coff
 
 # Installs the library and include files only. Typically called with only
 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
@@ -125,7 +126,7 @@ check : all
 mostlyclean : clean
 
 clean : force
-	$(RM) *.o *.lo libiconv.res *.a *.la core *.stackdump so_locations
+	$(RM) *.o *.lo *.a *.la core *.stackdump so_locations
 	$(RM) -r .libs _libs
 
 distclean : clean