[tracker/tracker-0.16] build scripts: Added switch to disable installation of artwork (icons etc)
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.16] build scripts: Added switch to disable installation of artwork (icons etc)
- Date: Wed, 31 Jul 2013 22:30:38 +0000 (UTC)
commit ffb0c8dd919c4543596789ddc2a355176d4e9a84
Author: Jonatan PĂ„lsson <jonatan palsson pelagicore com>
Date: Tue Jul 9 12:58:54 2013 +0200
build scripts: Added switch to disable installation of artwork (icons etc)
The switch is --disable-artwork
configure.ac | 23 +++++++++++++++++++++++
data/icons/16x16/Makefile.am | 6 +++++-
data/icons/22x22/Makefile.am | 6 +++++-
data/icons/24x24/Makefile.am | 6 +++++-
data/icons/32x32/Makefile.am | 6 +++++-
data/icons/48x48/Makefile.am | 6 +++++-
data/icons/scalable/Makefile.am | 6 +++++-
7 files changed, 53 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c787143..030a32b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2363,6 +2363,25 @@ AC_PATH_PROG(INITCTL, initctl, [])
AC_SUBST(INITCTL)
AM_CONDITIONAL(HAVE_UPSTART, test "x$INITCTL" != "x")
+####################################################################
+# Check whether we should install artwork
+####################################################################
+
+AC_ARG_ENABLE(artwork,
+ AS_HELP_STRING([--enable-artwork],
+ [install artwork, such as icons and logos [[default=auto]]]),,
+ [enable_artwork=auto])
+
+if test "x$enable_artwork" != "xno"; then
+ AC_DEFINE(HAVE_ARTWORK, [], [Define if we should install artwork])
+ have_artwork=yes
+else
+ have_artwork="no (disabled)"
+fi
+
+AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
+
+
##################################################################
# Write generated files
##################################################################
@@ -2607,6 +2626,10 @@ Frameworks / Options:
Support libmeegotouch $have_meegotouch
Support Guaranteed Metadata $enable_guarantee_metadata (e.g. guess nie:title from files)
+Miscellaneous:
+
+ Install artwork $have_artwork
+
"
# Any warnings we need to issue...
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 4db0c1f..56c696c 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,6 +1,10 @@
include $(top_srcdir)/Makefile.decl
icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = tracker.png
+icon_DATA = # Empty
+
+if HAVE_ARTWORK
+icon_DATA += tracker.png
+endif
EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index da11195..ca05c1a 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,6 +1,10 @@
include $(top_srcdir)/Makefile.decl
icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = tracker.png
+icon_DATA = # Empty
+
+if HAVE_ARTWORK
+icon_DATA += tracker.png
+endif
EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 070b021..77f2508 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,6 +1,10 @@
include $(top_srcdir)/Makefile.decl
icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = tracker.png
+icon_DATA = # Empty
+
+if HAVE_ARTWORK
+icon_DATA += tracker.png
+endif
EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index a0ea85a..124f147 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -1,6 +1,10 @@
include $(top_srcdir)/Makefile.decl
icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = tracker.png
+icon_DATA = # Empty
+
+if HAVE_ARTWORK
+icon_DATA += tracker.png
+endif
EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 2101cb6..ba1d45c 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,6 +1,10 @@
include $(top_srcdir)/Makefile.decl
icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = tracker.png
+icon_DATA = # Empty
+
+if HAVE_ARTWORK
+icon_DATA += tracker.png
+endif
EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index e5c1489..94267d2 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,7 +1,11 @@
include $(top_srcdir)/Makefile.decl
icondir = $(datadir)/icons/hicolor/scalable/apps
-icon_DATA = tracker.svg
+icon_DATA = # Empty
+
+if HAVE_ARTWORK
+icon_DATA += tracker.svg
+endif
minericonsdir = $(datadir)/tracker/icons
minericons_DATA =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]