From 465d0bb7d9960bc891b3c738f87b36e4a9d4e925 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Mon, 24 May 2010 23:03:38 +0100 Subject: [PATCH] keyboard: consolidate multiple INCLUDES definitions into one --- panels/keyboard/Makefile.am | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am index 90cf55278..510adfcdd 100644 --- a/panels/keyboard/Makefile.am +++ b/panels/keyboard/Makefile.am @@ -4,12 +4,12 @@ cappletname = keyboard INCLUDES = \ $(PANEL_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \ + $(LIBGNOMEKBDUI_CFLAGS) \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_UI_DIR="\"$(uidir)\"" $(NULL) - ccpanelsdir = $(PANELS_DIR) ccpanels_LTLIBRARIES = libkeyboard-properties.la @@ -45,12 +45,6 @@ desktopdir = $(datadir)/applications Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -INCLUDES = \ - $(GNOMECC_CAPPLETS_CFLAGS) \ - $(LIBGNOMEKBDUI_CFLAGS) \ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ - -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DGNOMECC_UI_DIR="\"$(uidir)\"" CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) EXTRA_DIST = $(ui_DATA)