GNOME.org
 

[gtk+] Rename gtk-update-icon-cache and gtk-builder-convert back

commit a975d62071d71814eb9e6b3c379228f4cd66f0d3
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 3 21:31:55 2011 -0500

    Rename gtk-update-icon-cache and gtk-builder-convert back
    
    In bug 635207, it was pointed out that it is a bad idea to
    rename these tools purely in the name of parallel-installability,
    since it forces dependencies to make a choice between running
    gtk-update-icon-cache and gtk-update-icon-cache-3.0 (or both ?!).
    
    So, we rename these utilities back to their un-suffixed names
    and rely on distributors to resolve the conflict between GTK+ 2.x
    and GTK+ 3.0 packages, which can be done e.g. by dropping the
    utilities from the gtk3 packages and add a gtk3 -> gtk2 dependency.

 docs/reference/gtk/Makefile.am                     |    8 +++---
 ...der-convert-3.0.xml => gtk-builder-convert.xml} |   10 ++++----
 docs/reference/gtk/gtk-docs.sgml                   |    4 +-
 ...con-cache-3.0.xml => gtk-update-icon-cache.xml} |   14 +++++-------
 gtk/Makefile.am                                    |   22 ++++++++++----------
 ...gtk-builder-convert-3.0 => gtk-builder-convert} |    0
 modules/input/Makefile.am                          |    4 +-
 7 files changed, 30 insertions(+), 32 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 9389c04..959e0b0 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -134,8 +134,8 @@ content_files =					\
 	windows.sgml				\
 	x11.sgml				\
 	gtk-query-immodules-3.0.xml		\
-	gtk-update-icon-cache-3.0.xml		\
-	gtk-builder-convert-3.0.xml		\
+	gtk-update-icon-cache.xml		\
+	gtk-builder-convert.xml			\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -370,8 +370,8 @@ EXTRA_DIST += version.xml.in
 
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
-	gtk-update-icon-cache-3.0.1	\
-	gtk-builder-convert-3.0.1
+	gtk-update-icon-cache.1		\
+	gtk-builder-convert.1
 
 if ENABLE_MAN
 
diff --git a/docs/reference/gtk/gtk-builder-convert-3.0.xml b/docs/reference/gtk/gtk-builder-convert.xml
similarity index 84%
rename from docs/reference/gtk/gtk-builder-convert-3.0.xml
rename to docs/reference/gtk/gtk-builder-convert.xml
index eccfe33..aa98d5d 100644
--- a/docs/reference/gtk/gtk-builder-convert-3.0.xml
+++ b/docs/reference/gtk/gtk-builder-convert.xml
@@ -1,18 +1,18 @@
 <refentry id="gtk-builder-convert">
 
 <refmeta>
-<refentrytitle>gtk-builder-convert-3.0</refentrytitle>
+<refentrytitle>gtk-builder-convert</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-builder-convert-3.0</refname>
+<refname>gtk-builder-convert</refname>
 <refpurpose>Glade file conversion utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-builder-convert-3.0</command>
+<command>gtk-builder-convert</command>
 <arg choice="opt">--skip-windows</arg>
 <arg choice="opt">--root <replaceable>name</replaceable></arg>
 <arg choice="req">input</arg>
@@ -21,7 +21,7 @@
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
-<para><command>gtk-builder-convert-3.0</command> converts glade files
+<para><command>gtk-builder-convert</command> converts glade files
 into XML files which can be loaded with GtkBuilder.
 </para>
 <para>
@@ -40,7 +40,7 @@ its output the file specified as the second argument.
   <varlistentry>
     <term>--root</term>
     <term>-r</term>
-    <listitem><para>Convert only the widget named <replaceable>name</replaceable> 
+    <listitem><para>Convert only the widget named <replaceable>name</replaceable>
        and its children.</para></listitem>
   </varlistentry>
 </variablelist>
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 39b9624..ca98b8f 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -356,8 +356,8 @@
   <part>
     <title>GTK+ Tools</title>
     <xi:include href="gtk-query-immodules-3.0.xml" />
-    <xi:include href="gtk-update-icon-cache-3.0.xml" />
-    <xi:include href="gtk-builder-convert-3.0.xml" />
+    <xi:include href="gtk-update-icon-cache.xml" />
+    <xi:include href="gtk-builder-convert.xml" />
   </part>
 
   <xi:include href="glossary.xml" />
diff --git a/docs/reference/gtk/gtk-update-icon-cache-3.0.xml b/docs/reference/gtk/gtk-update-icon-cache.xml
similarity index 91%
rename from docs/reference/gtk/gtk-update-icon-cache-3.0.xml
rename to docs/reference/gtk/gtk-update-icon-cache.xml
index 477f37c..2a5bc27 100644
--- a/docs/reference/gtk/gtk-update-icon-cache-3.0.xml
+++ b/docs/reference/gtk/gtk-update-icon-cache.xml
@@ -5,18 +5,18 @@
 <refentry id="gtk-update-icon-cache">
 
 <refmeta>
-<refentrytitle>gtk-update-icon-cache-3.0</refentrytitle>
+<refentrytitle>gtk-update-icon-cache</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-update-icon-cache-3.0</refname>
+<refname>gtk-update-icon-cache</refname>
 <refpurpose>Icon theme caching utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-update-icon-cache-3.0</command>
+<command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--index-only</arg>
@@ -29,7 +29,7 @@
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-update-icon-cache-3.0</command> creates mmap()able cache
+  <command>gtk-update-icon-cache</command> creates mmap()able cache
   files for icon themes.
 </para>
 <para>
@@ -39,7 +39,7 @@
   information about the icons in the directory tree below the given directory.
 </para>
 <para>
-  GTK+ can use the cache files created by <command>gtk-update-icon-cache-3.0</command>
+  GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
   to avoid a lot of system call and disk seek overhead when the application
   starts. Since the format of the cache files allows them to be mmap()ed
   shared between multiple applications, the overall memory consumption is
@@ -60,7 +60,7 @@
     <term>--ignore-theme-index</term>
     <term>-t</term>
     <listitem><para>Don't check for the existence of 'index.theme' in the icon
-     theme directory. Without this option, <command>gtk-update-icon-cache-3.0</command>
+     theme directory. Without this option, <command>gtk-update-icon-cache</command>
      refuses to create an icon cache in a directory which does not appear to
      be the toplevel directory of an icon theme.
     </para></listitem>
@@ -104,5 +104,3 @@ None known yet.
 </refsect1>
 
 </refentry>
-
-
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d04e253..215f305 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -990,18 +990,18 @@ endif
 #
 bin_PROGRAMS = \
 	gtk-query-immodules-3.0 \
-	gtk-update-icon-cache-3.0
+	gtk-update-icon-cache
 
-bin_SCRIPTS = gtk-builder-convert-3.0
+bin_SCRIPTS = gtk-builder-convert
 
 if OS_WIN32
 
 # Workaround for UAC silliness: programs with "update" in their name
 # are believed to be installers and require elevated privileges to be
 # used... Use a manifest file to tell Windows that
-# gtk-update-icon-cache-3.0.exe doesn't require any special privileges.
+# gtk-update-icon-cache.exe doesn't require any special privileges.
 
-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache-3.0.exe.manifest
+GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
 
 bin_SCRIPTS += \
 	$(GTK_UPDATE_ICON_CACHE_MANIFEST)
@@ -1011,7 +1011,7 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST):
 	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
 	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
 	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
-	 echo '     name="gtk-update-icon-cache-3.0.exe"' ; \
+	 echo '     name="gtk-update-icon-cache.exe"' ; \
 	 echo '     type="win32"/>' ; \
 	 echo '  <!-- Identify the application security requirements. -->' ; \
 	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
@@ -1031,8 +1031,8 @@ gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_3_0_LDADD = $(LDADDS)
 gtk_query_immodules_3_0_SOURCES = queryimmodules.c
 
-gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS)
-gtk_update_icon_cache_3_0_SOURCES = updateiconcache.c
+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+gtk_update_icon_cache_SOURCES = updateiconcache.c
 
 .PHONY: files test test-debug
 
@@ -1329,12 +1329,12 @@ if CROSS_COMPILING
 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
 else
 gtk_update_icon_cache_program =							\
-	   ./gtk-update-icon-cache-3.0
+	   ./gtk-update-icon-cache
 endif
 
 gtkbuiltincache.h: @REBUILD@ stamp-icons
-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache-3.0$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+	$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+	$(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index		\
 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
 
@@ -1348,7 +1348,7 @@ EXTRA_DIST +=                   \
 	tree_minus.xpm		\
 	tree_plus.xpm		\
 	gtk.def			\
-	gtk-builder-convert-3.0	\
+	gtk-builder-convert	\
 	gtk-win32.rc		\
 	gtk-win32.rc.in		\
 	gtkwin32embed.h		\
diff --git a/gtk/gtk-builder-convert-3.0 b/gtk/gtk-builder-convert
similarity index 100%
rename from gtk/gtk-builder-convert-3.0
rename to gtk/gtk-builder-convert
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 72c2029..eb078f9 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -184,7 +184,7 @@ endif
 # install-data-am, and not install-exec-am. We need to ensure this gets run
 # after the libraries are installed in their final locations.
 install-data-hook:
-	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
+	$(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
 	  echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
 	  echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \
@@ -236,7 +236,7 @@ noinst_LTLIBRARIES =				\
 included-modules: $(noinst_LTLIBRARIES)
 
 immodules.cache: Makefile.am $(module_LTLIBRARIES)
-	$(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache
+	$(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache
 
 EXTRA_DIST += README.multipress
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]