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.

13 files changed, 194 insertions, 104 deletions

diff --git a/ChangeLog b/ChangeLog
index e46361b21..439e4df6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e46361b21..439e4df6c 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e46361b21..439e4df6c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e46361b21..439e4df6c 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e46361b21..439e4df6c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e46361b21..439e4df6c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e46361b21..439e4df6c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,15 @@
-2000-11-14  Tor Lillqvist  <tml@iki.fi>
+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.
 
 	* gtk/gtkcompat.h.win32: Remove, useless. A distribution already
 	has a built gtkcompat.h. Developers using CVS code on Win32 can
diff --git a/configure.in b/configure.in
index 59d57cf5b..9b036704c 100644
--- a/configure.in
+++ b/configure.in
@@ -1038,12 +1038,15 @@ gdk/makefile.mingw
 gdk/x11/Makefile
 gdk/win32/Makefile
 gdk/win32/makefile.mingw
+gdk/win32/rc/Makefile
+gdk/win32/rc/gdk.rc
 gdk/nanox/Makefile
 gdk/linux-fb/Makefile
 gtk/Makefile
 gtk/makefile.mingw
 gtk/makefile.msc
 gtk/gtkcompat.h
+gtk/gtk.rc
 gtk/stock-icons/Makefile
 modules/Makefile
 modules/linux-fb/Makefile
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index ee0c27595..3c4d2b4d4 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=rc
+
 EXTRA_DIST = \
 	makefile.mingw \
 	makefile.msc \
@@ -23,86 +25,7 @@ EXTRA_DIST = \
 	gdkwin32.h \
 	gdkwin32id.c \
 	gdkwindow-win32.c \
-	surrogate-dimm.h \
-	rc/gdk.rc \
-	rc/gtk.ico \
-	rc/cursor00.cur \
-	rc/cursor02.cur \
-	rc/cursor04.cur \
-	rc/cursor06.cur \
-	rc/cursor08.cur \
-	rc/cursor0a.cur \
-	rc/cursor0c.cur \
-	rc/cursor0e.cur \
-	rc/cursor10.cur \
-	rc/cursor12.cur \
-	rc/cursor14.cur \
-	rc/cursor16.cur \
-	rc/cursor18.cur \
-	rc/cursor1a.cur \
-	rc/cursor1c.cur \
-	rc/cursor1e.cur \
-	rc/cursor20.cur \
-	rc/cursor22.cur \
-	rc/cursor24.cur \
-	rc/cursor26.cur \
-	rc/cursor28.cur \
-	rc/cursor2a.cur \
-	rc/cursor2c.cur \
-	rc/cursor2e.cur \
-	rc/cursor30.cur \
-	rc/cursor32.cur \
-	rc/cursor34.cur \
-	rc/cursor36.cur \
-	rc/cursor38.cur \
-	rc/cursor3a.cur \
-	rc/cursor3c.cur \
-	rc/cursor3e.cur \
-	rc/cursor40.cur \
-	rc/cursor42.cur \
-	rc/cursor44.cur \
-	rc/cursor46.cur \
-	rc/cursor48.cur \
-	rc/cursor4a.cur \
-	rc/cursor4c.cur \
-	rc/cursor4e.cur \
-	rc/cursor50.cur \
-	rc/cursor52.cur \
-	rc/cursor54.cur \
-	rc/cursor56.cur \
-	rc/cursor58.cur \
-	rc/cursor5a.cur \
-	rc/cursor5c.cur \
-	rc/cursor5e.cur \
-	rc/cursor60.cur \
-	rc/cursor62.cur \
-	rc/cursor64.cur \
-	rc/cursor66.cur \
-	rc/cursor68.cur \
-	rc/cursor6a.cur \
-	rc/cursor6c.cur \
-	rc/cursor6e.cur \
-	rc/cursor70.cur \
-	rc/cursor72.cur \
-	rc/cursor74.cur \
-	rc/cursor76.cur \
-	rc/cursor78.cur \
-	rc/cursor7a.cur \
-	rc/cursor7c.cur \
-	rc/cursor7e.cur \
-	rc/cursor80.cur \
-	rc/cursor82.cur \
-	rc/cursor84.cur \
-	rc/cursor86.cur \
-	rc/cursor88.cur \
-	rc/cursor8a.cur \
-	rc/cursor8c.cur \
-	rc/cursor8e.cur \
-	rc/cursor90.cur \
-	rc/cursor92.cur \
-	rc/cursor94.cur \
-	rc/cursor96.cur \
-	rc/cursor98.cur
+	surrogate-dimm.h
 
 makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/makefile.mingw.in
 	cd $(top_builddir) && CONFIG_FILES=gdk/win32/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am
new file mode 100644
index 000000000..2ed6aeac0
--- /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 ee4d56e63..b3470c0a9 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"
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9151ef0c1..fbb459823 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -613,6 +613,9 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.i
 makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in
 	cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+gtk.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk.rc.in
+	cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files test test-debug
 
 files:
@@ -652,9 +655,9 @@ EXTRA_DIST += @STRIP_BEGIN@ 	\
 	check-y.xpm		\
 	check-n.xpm		\
 	test.xpm		\
-	gtkcompat.h.win32	\
 	gtk.def			\
 	gtk.rc			\
+	gtk.rc.in		\
 	makefile.mingw		\
 	makefile.mingw.in	\
 	makefile.msc		\
diff --git a/gtk/gtk.rc b/gtk/gtk.rc.in
index c2cfc0a2a..871fe05a5 100644
--- a/gtk/gtk.rc
+++ b/gtk/gtk.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 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
@@ -13,14 +13,14 @@ VS_VERSION_INFO VERSIONINFO
     BEGIN
       BLOCK "040904B0"
       BEGIN
-	VALUE "CompanyName", "The GTk+ developer community"
+	VALUE "CompanyName", "The GTK+ developer community"
 	VALUE "FileDescription", "GIMP Toolkit"
-	VALUE "FileVersion", "1.3.0.BUILDNUMBER"
-	VALUE "InternalName", "gtk-1.3"
+	VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
+	VALUE "InternalName", "gtk-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", "gtk-1.3.dll"
-	VALUE "ProductName", "GTk+"
-	VALUE "ProductVersion", "1.3.0"
+	VALUE "OriginalFilename", "gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll"
+	VALUE "ProductName", "GTK+"
+	VALUE "ProductVersion", "@GTK_VERSION@"
       END
     END
     BLOCK "VarFileInfo"