Remove. New file. New file Corresponding changes.

2000-11-15  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/rc/gdk.rc: Remove.
	* gdk/win32/rc/gdk.rc.in: New file.
	* gdk/win32/rc/Makefile.am: New file
	* gdk/win32/Makefile.am: Corresponding changes.

	* gtk/gtk.rc: Remove.
	* gtk/gtk.rc.in: New file.
	* gtk/Makefile.am: Corresponding changes.

	* configure.in: Corresponding changes.

2 files changed, 92 insertions, 8 deletions

diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am
new file mode 100644
index 0000000000..2ed6aeac08
--- /dev/null
+++ b/gdk/win32/rc/Makefile.am
@@ -0,0 +1,84 @@
+EXTRA_DIST = \
+	gdk.rc \
+	gdk.rc.in \
+	gtk.ico \
+	cursor00.cur \
+	cursor02.cur \
+	cursor04.cur \
+	cursor06.cur \
+	cursor08.cur \
+	cursor0a.cur \
+	cursor0c.cur \
+	cursor0e.cur \
+	cursor10.cur \
+	cursor12.cur \
+	cursor14.cur \
+	cursor16.cur \
+	cursor18.cur \
+	cursor1a.cur \
+	cursor1c.cur \
+	cursor1e.cur \
+	cursor20.cur \
+	cursor22.cur \
+	cursor24.cur \
+	cursor26.cur \
+	cursor28.cur \
+	cursor2a.cur \
+	cursor2c.cur \
+	cursor2e.cur \
+	cursor30.cur \
+	cursor32.cur \
+	cursor34.cur \
+	cursor36.cur \
+	cursor38.cur \
+	cursor3a.cur \
+	cursor3c.cur \
+	cursor3e.cur \
+	cursor40.cur \
+	cursor42.cur \
+	cursor44.cur \
+	cursor46.cur \
+	cursor48.cur \
+	cursor4a.cur \
+	cursor4c.cur \
+	cursor4e.cur \
+	cursor50.cur \
+	cursor52.cur \
+	cursor54.cur \
+	cursor56.cur \
+	cursor58.cur \
+	cursor5a.cur \
+	cursor5c.cur \
+	cursor5e.cur \
+	cursor60.cur \
+	cursor62.cur \
+	cursor64.cur \
+	cursor66.cur \
+	cursor68.cur \
+	cursor6a.cur \
+	cursor6c.cur \
+	cursor6e.cur \
+	cursor70.cur \
+	cursor72.cur \
+	cursor74.cur \
+	cursor76.cur \
+	cursor78.cur \
+	cursor7a.cur \
+	cursor7c.cur \
+	cursor7e.cur \
+	cursor80.cur \
+	cursor82.cur \
+	cursor84.cur \
+	cursor86.cur \
+	cursor88.cur \
+	cursor8a.cur \
+	cursor8c.cur \
+	cursor8e.cur \
+	cursor90.cur \
+	cursor92.cur \
+	cursor94.cur \
+	cursor96.cur \
+	cursor98.cur
+
+gdk.rc: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/rc/gdk.rc.in
+	cd $(top_builddir) && CONFIG_FILES=gdk/win32/rc/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/gdk/win32/rc/gdk.rc b/gdk/win32/rc/gdk.rc.in
index ee4d56e632..b3470c0a9d 100644
--- a/gdk/win32/rc/gdk.rc
+++ b/gdk/win32/rc/gdk.rc.in
@@ -80,8 +80,8 @@ xterm                   CURSOR  DISCARDABLE     "cursor98.cur"
 watch                   CURSOR  DISCARDABLE     "cursor96.cur"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,3,0,BUILDNUMBER
-  PRODUCTVERSION 1,3,0,0
+  FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -92,14 +92,14 @@ VS_VERSION_INFO VERSIONINFO
     BEGIN
       BLOCK "040904B0"
       BEGIN
-	VALUE "CompanyName", "The GTk+ developer community"
+	VALUE "CompanyName", "The GTK+ developer community"
 	VALUE "FileDescription", "GIMP Drawing Kit"
-	VALUE "FileVersion", "1.3.0.BUILDNUMBER"
-	VALUE "InternalName", "gdk-1.3"
+	VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
+	VALUE "InternalName", "gdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@"
 	VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2000."
-	VALUE "OriginalFilename", "gdk-1.3.dll"
-	VALUE "ProductName", "GTk+"
-	VALUE "ProductVersion", "1.3.0"
+	VALUE "OriginalFilename", "gdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll"
+	VALUE "ProductName", "GTK+"
+	VALUE "ProductVersion", "@GTK_VERSION@"
       END
     END
     BLOCK "VarFileInfo"