applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: remove redundant variables

Browse source 
GNOMECC_CAPPLETS_CLEANFILES duplicated existing files to be removed and
GNOMECC_CAPPLETS_EXTRA_DIST was no longer used anywhere.
This commit is contained in:
Thomas Wood 2010-12-20 14:46:27 +00:00
parent 4eb38e621d
commit ca7bdc3f7e
7 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -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)

2
panels/default-applications/Makefile.am
View file

@ -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

2
panels/display/Makefile.am
View file

@ -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

1
panels/keyboard/Makefile.am
View file

@ -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)

1
panels/media/Makefile.am
View file

@ -30,7 +30,6 @@ INCLUDES = \
-DGNOMECC_UI_DIR=\""$(uidir)"\"
CLEANFILES = \
$(GNOMECC_CAPPLETS_CLEANFILES) \
$(Desktop_in_files) \
$(desktop_DATA)

2
panels/mouse/Makefile.am
View file

@ -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

2
panels/region/Makefile.am
View file

@ -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)