[Xfce4-commits] r26868 - in xfce4-icon-theme/branches/xfce4-icon-theme-compliant: . Rodent-2/48x48/actions Rodent-2/48x48/devices Rodent-2/48x48/mimetypes Rodent-2/48x48/places Rodent-2/48x48/status

[Stephan Arts]

Author: stephan
Date: 2008-04-18 22:59:41 +0000 (Fri, 18 Apr 2008)
New Revision: 26868

Modified:
   xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/actions/Makefile.am
   xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/devices/Makefile.am
   xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/mimetypes/Makefile.am
   xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/places/Makefile.am
   xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/status/Makefile.am
   xfce4-icon-theme/branches/xfce4-icon-theme-compliant/configure.in.in
Log:
Add --disable-deprecated configure option.
 (only installs icon-naming-spec compliant icons)


Modified: xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/actions/Makefile.am
===================================================================
--- xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/actions/Makefile.am	2008-04-17 21:54:08 UTC (rev 26867)
+++ xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/actions/Makefile.am	2008-04-18 22:59:41 UTC (rev 26868)
@@ -62,11 +62,4 @@
 additional_icons = \
 system-shutdown.png
 
-icon_DATA = \
-	$(icon_naming_spec_compatible_icons) \
-	$(gtk_compatible_icons) \
-	$(kde_compatible_icons)
-	\
-	$(additional_icons)
-
-EXTRA_DIST =  $(icon_DATA)
+include $(top_srcdir)/Rodent-2/Makefile.inc

Modified: xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/devices/Makefile.am
===================================================================
--- xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/devices/Makefile.am	2008-04-17 21:54:08 UTC (rev 26867)
+++ xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/devices/Makefile.am	2008-04-18 22:59:41 UTC (rev 26868)
@@ -11,9 +11,4 @@
 drive-harddisk.png \
 drive-optical.png
 
-icon_DATA = \
-	$(icon_naming_spec_compatible_icons) \
-	$(gtk_compatible_icons) \
-	$(kde_compatible_icons)
-
-EXTRA_DIST =  $(icon_DATA)
+include $(top_srcdir)/Rodent-2/Makefile.inc

Modified: xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/mimetypes/Makefile.am
===================================================================
--- xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/mimetypes/Makefile.am	2008-04-17 21:54:08 UTC (rev 26867)
+++ xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/mimetypes/Makefile.am	2008-04-18 22:59:41 UTC (rev 26868)
@@ -8,10 +8,16 @@
 package-x-generic.png \
 text-x-generic.png \
 text-x-script.png \
-video-x-generic.png
+video-x-generic.png \
+x-office-document.png \
+x-office-presentation.png \
+x-office-spreadsheet.png
 
+additional_mimetype_icons = 
+
 icon_DATA = \
-	$(generic_mimetype_icons)
+	$(generic_mimetype_icons) \
+	$(additional_mimetype_icons)
 
 EXTRA_DIST =  $(icon_DATA)
 

Modified: xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/places/Makefile.am
===================================================================
--- xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/places/Makefile.am	2008-04-17 21:54:08 UTC (rev 26867)
+++ xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/places/Makefile.am	2008-04-18 22:59:41 UTC (rev 26868)
@@ -14,9 +14,4 @@
 user-desktop.png \
 user-trash.png
 
-icon_DATA = \
-	$(icon_naming_spec_compatible_icons) \
-	$(gtk_compatible_icons) \
-	$(kde_compatible_icons)
-
-EXTRA_DIST =  $(icon_DATA)
+include $(top_srcdir)/Rodent-2/Makefile.inc

Modified: xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/status/Makefile.am
===================================================================
--- xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/status/Makefile.am	2008-04-17 21:54:08 UTC (rev 26867)
+++ xfce4-icon-theme/branches/xfce4-icon-theme-compliant/Rodent-2/48x48/status/Makefile.am	2008-04-18 22:59:41 UTC (rev 26868)
@@ -8,10 +8,4 @@
 icon_naming_spec_compatible_icons = \
 user-trash-full.png
 
-icon_DATA = \
-	$(icon_naming_spec_compatible_icons) \
-	$(gtk_compatible_icons) \
-	$(kde_compatible_icons)
-
-EXTRA_DIST =  $(icon_DATA)
-
+include $(top_srcdir)/Rodent-2/Makefile.inc

Modified: xfce4-icon-theme/branches/xfce4-icon-theme-compliant/configure.in.in
===================================================================
--- xfce4-icon-theme/branches/xfce4-icon-theme-compliant/configure.in.in	2008-04-17 21:54:08 UTC (rev 26867)
+++ xfce4-icon-theme/branches/xfce4-icon-theme-compliant/configure.in.in	2008-04-18 22:59:41 UTC (rev 26868)
@@ -43,6 +43,13 @@
 AC_PROG_INTLTOOL([0.31], [no-xml])
 AC_PROG_LN_S()
 
+AC_ARG_ENABLE([deprecated_icons],
+              [AC_HELP_STRING([--disable-deprecated],
+                              [Don't install deprecated (non icon-naming-spec compliant) icons (default=yes)])],
+              [build_deprecated=$enableval],
+              [build_deprecated=yes])
+AM_CONDITIONAL([DISABLE_DEPRECATED], [test "x$build_deprecated" = "xyes"])
+
 AC_HEADER_STDC
 
 dnl I18n support