Put a version info resource also in the gio DLL

Also, distribute gio/gio.rc(.in).

diff --git a/configure.in b/configure.in
index f30b05f..70b8fed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3577,6 +3577,7 @@ if false; then
     gobject/gobject.rc
     gthread/makefile.msc
     gthread/gthread.rc
+    gio/gio.rc
     tests/makefile.msc
   ])
 fi

diff --git a/gio/Makefile.am b/gio/Makefile.am
index b8001f8..73cb00e 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -308,6 +308,9 @@ if OS_WIN32_AND_DLL_COMPILATION
 export_symbols = -export-symbols gio.def
 gio_def = gio.def
 
+gio_win32_res = gio-win32-res.o
+gio_win32_res_ldflag = -Wl,$(gio_win32_res)
+
 install-def-file:
        $(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def
 
@@ -326,10 +329,14 @@ install-data-local: install-ms-lib install-def-file
 uninstall-local: uninstall-ms-lib uninstall-def-file
 
 libgio_2_0_la_LDFLAGS = \
+       $(gio_win32_res_ldflag) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-dynamic $(no_undefined) $(export_symbols)
 
-libgio_2_0_la_DEPENDENCIES = $(gio_def) $(platform_deps)
+libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+
+gio-win32-res.o: gio.rc
+       $(WINDRES) gio.rc $@
 
 gio_headers =                  \
        gappinfo.h              \
@@ -429,8 +436,12 @@ EXTRA_DIST +=                      \
        makegioalias.pl         \
        abicheck.sh             \
        pltcheck.sh             \
+       gio.rc.in               \
        $(NULL)
 
+BUILT_EXTRA_DIST =             \
+       gio.rc
+
 CLEANFILES =                   \
        $(marshal_sources)      \
        $(NULL)
@@ -457,6 +468,11 @@ gio_querymodules_LDADD      = \
        libgio-2.0.la                                   \
        $(NULL)
 
+dist-hook: $(BUILT_EXTRA_DIST)
+       files='$(BUILT_EXTRA_DIST)'; \
+       for f in $$files; do \
+         if test -f $$f; then d=.; else d=$(srcdir); fi; \
+         cp $$d/$$f $(distdir) || exit 1; done
 
 if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:

diff --git a/gio/gio.rc.in b/gio/gio.rc.in
index 1ad7cd5..2e1d00f 100644 (file)
--- a/gio/gio.rc.in
+++ b/gio/gio.rc.in
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
        VALUE "FileDescription", "Gio"
        VALUE "FileVersion", "@GLIB_VERSION@.0"
        VALUE "InternalName", "libgio-2.0-@LT_CURRENT_MINUS_AGE@"
-       VALUE "LegalCopyright", "Copyright © 2006-2007 Red Hat, Inc. Modified by the GLib Team and others 2006-2008."
+       VALUE "LegalCopyright", "Copyright © 2006-2010 Red Hat, Inc. and others."
        VALUE "OriginalFilename", "libgio-2.0-@LT_CURRENT_MINUS_AGE@.dll"
        VALUE "ProductName", "GLib"
        VALUE "ProductVersion", "@GLIB_VERSION@"