diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 6 | ||||
| -rw-r--r-- | gtk/gtk-win32.rc.in (renamed from gtk/gtk.rc.in) | 0 |
10 files changed, 11 insertions, 11 deletions
@@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d8b1b7cb8f..7769ce2725 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d8b1b7cb8f..7769ce2725 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d8b1b7cb8f..7769ce2725 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d8b1b7cb8f..7769ce2725 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d8b1b7cb8f..7769ce2725 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d8b1b7cb8f..7769ce2725 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -15,7 +15,7 @@ * gdk/win32/Makefile.am: Corresponding changes. * gtk/gtk.rc: Remove. - * gtk/gtk.rc.in: New file. + * gtk/gtk-win32.rc.in: New file. * gtk/Makefile.am: Corresponding changes. * configure.in: Corresponding changes. diff --git a/configure.in b/configure.in index 9b036704c8..216702f377 100644 --- a/configure.in +++ b/configure.in @@ -1046,7 +1046,7 @@ gtk/Makefile gtk/makefile.mingw gtk/makefile.msc gtk/gtkcompat.h -gtk/gtk.rc +gtk/gtk-win32.rc gtk/stock-icons/Makefile modules/Makefile modules/linux-fb/Makefile diff --git a/gtk/Makefile.am b/gtk/Makefile.am index fbb4598232..7053e50ce4 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -613,7 +613,7 @@ 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 +gtk-win32.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk-win32.rc.in cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status .PHONY: files test test-debug @@ -656,8 +656,8 @@ EXTRA_DIST += @STRIP_BEGIN@ \ check-n.xpm \ test.xpm \ gtk.def \ - gtk.rc \ - gtk.rc.in \ + gtk-win32.rc \ + gtk-win32.rc.in \ makefile.mingw \ makefile.mingw.in \ makefile.msc \ diff --git a/gtk/gtk.rc.in b/gtk/gtk-win32.rc.in index 871fe05a59..871fe05a59 100644 --- a/gtk/gtk.rc.in +++ b/gtk/gtk-win32.rc.in |