[gnome-control-center] build: remove redundant variables
- From: Thomas Wood <thos src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] build: remove redundant variables
- Date: Mon, 20 Dec 2010 15:27:26 +0000 (UTC)
commit ca7bdc3f7ef9a7fa18d7eaa90bc390d3e88a06d4
Author: Thomas Wood <thos gnome org>
Date: Mon Dec 20 14:46:27 2010 +0000
build: remove redundant variables
GNOMECC_CAPPLETS_CLEANFILES duplicated existing files to be removed and
GNOMECC_CAPPLETS_EXTRA_DIST was no longer used anywhere.
configure.ac | 5 -----
panels/default-applications/Makefile.am | 2 +-
panels/display/Makefile.am | 2 +-
panels/keyboard/Makefile.am | 1 -
panels/media/Makefile.am | 1 -
panels/mouse/Makefile.am | 2 +-
panels/region/Makefile.am | 2 +-
7 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7393bad..ab9e2dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,11 +189,6 @@ EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\
GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} ${EXTRA_CFLAGS} ${DBUS_CFLAGS}"
GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} ${DBUS_LIBS}"
-GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
-GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(cappletname)-capplet.png \$(pixmaps_DATA)"
-
-AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
-AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES)
AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
AC_SUBST(GNOMECC_CAPPLETS_LIBS)
diff --git a/panels/default-applications/Makefile.am b/panels/default-applications/Makefile.am
index bd144b9..9aadf48 100644
--- a/panels/default-applications/Makefile.am
+++ b/panels/default-applications/Makefile.am
@@ -78,7 +78,7 @@ update-icon-cache:
fi
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS)
+CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS)
EXTRA_DIST = $(xmldata_in_files) gnome-default-applications.pc.in
-include $(top_srcdir)/git.mk
diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am
index 4e3050a..a72ef4d 100644
--- a/panels/display/Makefile.am
+++ b/panels/display/Makefile.am
@@ -58,7 +58,7 @@ INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
+CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook: update-icon-cache
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
index 77c8d1a..78374fc 100644
--- a/panels/keyboard/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -48,7 +48,6 @@ INCLUDES = \
-DGNOMECC_UI_DIR="\"$(uidir)\"" \
-DGNOMECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\""
CLEANFILES = \
- $(GNOMECC_CAPPLETS_CLEANFILES) \
$(Desktop_in_files) \
$(desktop_DATA) \
$(xml_DATA)
diff --git a/panels/media/Makefile.am b/panels/media/Makefile.am
index 26f527a..838f4bc 100644
--- a/panels/media/Makefile.am
+++ b/panels/media/Makefile.am
@@ -30,7 +30,6 @@ INCLUDES = \
-DGNOMECC_UI_DIR=\""$(uidir)"\"
CLEANFILES = \
- $(GNOMECC_CAPPLETS_CLEANFILES) \
$(Desktop_in_files) \
$(desktop_DATA)
diff --git a/panels/mouse/Makefile.am b/panels/mouse/Makefile.am
index e89954f..146f1e2 100644
--- a/panels/mouse/Makefile.am
+++ b/panels/mouse/Makefile.am
@@ -42,7 +42,7 @@ desktopdir = $(datadir)/applications
Desktop_in_files = gnome-mouse-panel.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
+CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(ui_DATA) $(pixmap_DATA)
-include $(top_srcdir)/git.mk
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
index 6bd63ca..81da171 100644
--- a/panels/region/Makefile.am
+++ b/panels/region/Makefile.am
@@ -44,7 +44,7 @@ desktopdir = $(datadir)/applications
Desktop_in_files = gnome-region-panel.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
+CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(ui_DATA)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]