[gnome-icon-theme-extras] More Makefile cleanups
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-icon-theme-extras] More Makefile cleanups
- Date: Tue, 23 Mar 2010 12:12:07 +0000 (UTC)
commit e817b137d339b0e7b5338b86477853dbc122f991
Author: Bastien Nocera <hadess hadess net>
Date: Tue Mar 23 11:53:48 2010 +0000
More Makefile cleanups
.gitignore | 9 +++++++++
Makefile.am | 14 +-------------
configure.ac | 3 +--
gnome-icon-theme-extras.pc.in | 6 ------
4 files changed, 11 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6047448
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.log
+config.status
+configure
+install-sh
+missing
diff --git a/Makefile.am b/Makefile.am
index 696f6b3..f6ab79b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-icon-mapping
SUBDIRS = $(SVGSRCDIR)
-theme_in_files = index.theme.in.in
-theme_DATA = $(theme_in_files:.theme.in.in=.theme)
-
THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done | sed -e "s/,$$//g")
render: Makefile
@@ -21,16 +18,7 @@ install-data-local:
touch $(DESTDIR)$(themedir); \
fi
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = gnome-icon-theme.pc
-
-EXTRA_DIST = \
- gnome-icon-theme.pc.in \
- gnome \
- $(theme_in_files)
-
-CLEANFILES = \
- $(theme_DATA)
+EXTRA_DIST = gnome
MAINTAINERCLEANFILES = \
Makefile.in \
diff --git a/configure.ac b/configure.ac
index 8a046ed..eaa93d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_SUBST(SVGSRCDIR, "src")
AC_SUBST(SVGOUTDIR, "gnome")
# Icon sizes we want to install
-AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256"])
+AC_SUBST([render_sizes], ["16x16 22x22 24x24 32x32 48x48 256x256"])
# Allow icon mapping to be disabled
AC_ARG_ENABLE([icon-mapping],
@@ -66,7 +66,6 @@ AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes")
AC_CONFIG_FILES([
Makefile
-gnome-icon-theme-extras.pc
src/Makefile
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]