Move "nautilus" named icon from icon/appicon to data/icons matching the

2008-01-10  Luca Ferretti  <elle.uca@libero.it>

	* configure.in:
	* data/Makefile.am:
	* data/icons/*:
	* icons/Makefile.am:
	* icons/appicon/*:
	Move "nautilus" named icon from icon/appicon to data/icons
	matching the directory and naming structure of other GNOME
	projects.

	This will also help if we'll need to add custom themeable
	icons.


svn path=/trunk/; revision=13583

24 files changed, 45 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index c570aa6c3..b6e9bff1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-10  Luca Ferretti  <elle.uca@libero.it>
+
+	* configure.in:
+	* data/Makefile.am:
+	* data/icons/*:
+	* icons/Makefile.am:
+	* icons/appicon/*:
+	Move "nautilus" named icon from icon/appicon to data/icons
+	matching the directory and naming structure of other GNOME
+	projects.
+
+	This will also help if we'll need to add custom themeable
+	icons.
+
 2008-01-10  Alexander Larsson  <alexl@redhat.com>
 
         * libnautilus-private/nautilus-mime-actions.c:
diff --git a/configure.in b/configure.in
index d8ae3faee..86b776cbe 100644
--- a/configure.in
+++ b/configure.in
@@ -462,15 +462,20 @@ cut-n-paste-code/libegg/Makefile
 cut-n-paste-code/gsequence/Makefile
 cut-n-paste-code/widgets/Makefile
 data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/16x16/apps/Makefile
+data/icons/22x22/Makefile
+data/icons/22x22/apps/Makefile
+data/icons/24x24/Makefile
+data/icons/24x24/apps/Makefile
+data/icons/32x32/Makefile
+data/icons/32x32/apps/Makefile
+data/icons/scalable/Makefile
+data/icons/scalable/apps/Makefile
 data/patterns/Makefile
 docs/Makefile
 icons/Makefile
-icons/appicon/Makefile
-icons/appicon/16x16/Makefile
-icons/appicon/22x22/Makefile
-icons/appicon/24x24/Makefile
-icons/appicon/32x32/Makefile
-icons/appicon/scalable/Makefile
 libbackground/Makefile
 libnautilus-private/Makefile
 libnautilus-extension/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 6fea76049..293441139 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST = $(nautilusdata_DATA) \
 CLEANFILES = $(xml_files)
 
 SUBDIRS = \
+	icons    \
 	patterns \
 	$(NULL)
 
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
new file mode 100644
index 000000000..ebbd1452f
--- /dev/null
+++ b/data/icons/16x16/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = apps
diff --git a/icons/appicon/16x16/Makefile.am b/data/icons/16x16/apps/Makefile.am
index 093bd1ca8..093bd1ca8 100644
--- a/icons/appicon/16x16/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
diff --git a/icons/appicon/16x16/nautilus.png b/data/icons/16x16/apps/nautilus.png
index fa5c46910..fa5c46910 100644
--- a/icons/appicon/16x16/nautilus.png
+++ b/data/icons/16x16/apps/nautilus.png
diff --git a/icons/appicon/16x16/nautilus.svg b/data/icons/16x16/apps/nautilus.svg
index 5bd489464..5bd489464 100644
--- a/icons/appicon/16x16/nautilus.svg
+++ b/data/icons/16x16/apps/nautilus.svg
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
new file mode 100644
index 000000000..ebbd1452f
--- /dev/null
+++ b/data/icons/22x22/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = apps
diff --git a/icons/appicon/22x22/Makefile.am b/data/icons/22x22/apps/Makefile.am
index acb7b5c97..acb7b5c97 100644
--- a/icons/appicon/22x22/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
diff --git a/icons/appicon/22x22/nautilus.png b/data/icons/22x22/apps/nautilus.png
index 945d4d740..945d4d740 100644
--- a/icons/appicon/22x22/nautilus.png
+++ b/data/icons/22x22/apps/nautilus.png
diff --git a/icons/appicon/22x22/nautilus.svg b/data/icons/22x22/apps/nautilus.svg
index d18c6de70..d18c6de70 100644
--- a/icons/appicon/22x22/nautilus.svg
+++ b/data/icons/22x22/apps/nautilus.svg
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
new file mode 100644
index 000000000..ebbd1452f
--- /dev/null
+++ b/data/icons/24x24/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = apps
diff --git a/icons/appicon/24x24/Makefile.am b/data/icons/24x24/apps/Makefile.am
index 899b3f7c2..899b3f7c2 100644
--- a/icons/appicon/24x24/Makefile.am
+++ b/data/icons/24x24/apps/Makefile.am
diff --git a/icons/appicon/24x24/nautilus.png b/data/icons/24x24/apps/nautilus.png
index ea61f182c..ea61f182c 100644
--- a/icons/appicon/24x24/nautilus.png
+++ b/data/icons/24x24/apps/nautilus.png
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
new file mode 100644
index 000000000..ebbd1452f
--- /dev/null
+++ b/data/icons/32x32/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = apps
diff --git a/icons/appicon/32x32/Makefile.am b/data/icons/32x32/apps/Makefile.am
index 9241d3a3c..9241d3a3c 100644
--- a/icons/appicon/32x32/Makefile.am
+++ b/data/icons/32x32/apps/Makefile.am
diff --git a/icons/appicon/32x32/nautilus.png b/data/icons/32x32/apps/nautilus.png
index 3f4f8e0f9..3f4f8e0f9 100644
--- a/icons/appicon/32x32/nautilus.png
+++ b/data/icons/32x32/apps/nautilus.png
diff --git a/icons/appicon/32x32/nautilus.svg b/data/icons/32x32/apps/nautilus.svg
index 2bcf1371b..2bcf1371b 100644
--- a/icons/appicon/32x32/nautilus.svg
+++ b/data/icons/32x32/apps/nautilus.svg
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 000000000..87db08603
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,14 @@
+SUBDIRS = 16x16 22x22 24x24 32x32 scalable
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
new file mode 100644
index 000000000..ebbd1452f
--- /dev/null
+++ b/data/icons/scalable/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = apps
diff --git a/icons/appicon/scalable/Makefile.am b/data/icons/scalable/apps/Makefile.am
index 46109ecfd..46109ecfd 100644
--- a/icons/appicon/scalable/Makefile.am
+++ b/data/icons/scalable/apps/Makefile.am
diff --git a/icons/appicon/scalable/nautilus.svg b/data/icons/scalable/apps/nautilus.svg
index df00a0dcd..df00a0dcd 100644
--- a/icons/appicon/scalable/nautilus.svg
+++ b/data/icons/scalable/apps/nautilus.svg
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 139516d9b..b292f7724 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,7 +1,5 @@
 NULL=
 
-SUBDIRS = appicon
-
 icondir = $(datadir)/pixmaps/nautilus
 
 icon_DATA =\
diff --git a/icons/appicon/Makefile.am b/icons/appicon/Makefile.am
deleted file mode 100644
index 25f9c2940..000000000
--- a/icons/appicon/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-NULL = 
-
-SUBDIRS = 16x16 22x22 24x24 32x32 scalable
\ No newline at end of file