From 11bdfeaf3bb4271fca0e4063d699bff6df4fb9df Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 19 Sep 2011 22:53:06 +0200 Subject: gtk2-themes: normalize package name and directory [Peter: fix directory argument of AUTOTARGETS macro] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gtk2-themes/Config.in | 3 +-- package/gtk2-themes/gtk2-theme-hicolor/Config.in | 2 ++ .../gtk2-theme-hicolor/gtk2-theme-hicolor.mk | 18 ++++++++++++++++++ package/gtk2-themes/gtk2-themes.mk | 1 + package/gtk2-themes/gtk2_themes.mk | 18 ------------------ 5 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 package/gtk2-themes/gtk2-theme-hicolor/Config.in create mode 100644 package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk create mode 100644 package/gtk2-themes/gtk2-themes.mk delete mode 100644 package/gtk2-themes/gtk2_themes.mk diff --git a/package/gtk2-themes/Config.in b/package/gtk2-themes/Config.in index 351b602c0..ac212b898 100644 --- a/package/gtk2-themes/Config.in +++ b/package/gtk2-themes/Config.in @@ -1,7 +1,6 @@ menu "GTK Themes" depends on BR2_PACKAGE_LIBGTK2 -config BR2_PACKAGE_GTK2_THEME_HICOLOR - bool "hicolor (default theme)" +source "package/gtk2-themes/gtk2-theme-hicolor/Config.in" endmenu diff --git a/package/gtk2-themes/gtk2-theme-hicolor/Config.in b/package/gtk2-themes/gtk2-theme-hicolor/Config.in new file mode 100644 index 000000000..144f1d865 --- /dev/null +++ b/package/gtk2-themes/gtk2-theme-hicolor/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_GTK2_THEME_HICOLOR + bool "hicolor (default theme)" diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk new file mode 100644 index 000000000..ac2eaef82 --- /dev/null +++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk @@ -0,0 +1,18 @@ +############################################################# +# +# GTK Theme - Hicolour +# +############################################################# +GTK2_THEME_HICOLOR_VERSION = 0.10 +GTK2_THEME_HICOLOR_SOURCE = hicolor-icon-theme-$(GTK2_THEME_HICOLOR_VERSION).tar.gz +GTK2_THEME_HICOLOR_SITE = http://icon-theme.freedesktop.org/releases/ +GTK2_THEME_HICOLOR_INSTALL_STAGING = NO +GTK2_THEME_HICOLOR_INSTALL_TARGET = YES + +GTK2_THEME_HICOLOR_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) --prefix=/usr \ + --includedir=/usr/include + +GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2 + +$(eval $(call AUTOTARGETS,package/gtk2-themes,gtk2-theme-hicolor)) diff --git a/package/gtk2-themes/gtk2-themes.mk b/package/gtk2-themes/gtk2-themes.mk new file mode 100644 index 000000000..6f31c6da9 --- /dev/null +++ b/package/gtk2-themes/gtk2-themes.mk @@ -0,0 +1 @@ +include package/gtk2-themes/*/*.mk diff --git a/package/gtk2-themes/gtk2_themes.mk b/package/gtk2-themes/gtk2_themes.mk deleted file mode 100644 index 8dc8af487..000000000 --- a/package/gtk2-themes/gtk2_themes.mk +++ /dev/null @@ -1,18 +0,0 @@ -############################################################# -# -# GTK Theme - Hicolour -# -############################################################# -GTK2_THEME_HICOLOR_VERSION = 0.10 -GTK2_THEME_HICOLOR_SOURCE = hicolor-icon-theme-$(GTK2_THEME_HICOLOR_VERSION).tar.gz -GTK2_THEME_HICOLOR_SITE = http://icon-theme.freedesktop.org/releases/ -GTK2_THEME_HICOLOR_INSTALL_STAGING = NO -GTK2_THEME_HICOLOR_INSTALL_TARGET = YES - -GTK2_THEME_HICOLOR_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) --prefix=/usr \ - --includedir=/usr/include - -GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2 - -$(eval $(call AUTOTARGETS,package,gtk2_theme_hicolor)) -- cgit v1.2.3