diff options
| -rw-r--r-- | core/mk/packages.mk | 4 | ||||
| -rw-r--r-- | packages/htools/gperf/gperf.kconfig (renamed from core/kconfig/gperf_host.kconfig) | 13 | ||||
| -rw-r--r-- | packages/htools/gperf/gperf.mk (renamed from core/mk/gperf_host.mk) | 8 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.kconfig | 7 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 |
5 files changed, 12 insertions, 23 deletions
diff --git a/core/mk/packages.mk b/core/mk/packages.mk index c97cacd..5a2fef1 100644 --- a/core/mk/packages.mk +++ b/core/mk/packages.mk @@ -31,10 +31,6 @@ HOSTTOOLS_COMPONENTS-y := mkimage_install # include packages/htools/hosttools-buildopts.mk -# gperf -include core/mk/gperf_host.mk -HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GPERF) += gperf_host_install - # libelf include packages/misc/libelf/libelf.mk ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBELF) += libelf_install diff --git a/core/kconfig/gperf_host.kconfig b/packages/htools/gperf/gperf.kconfig index 89088d4..7be2403 100644 --- a/core/kconfig/gperf_host.kconfig +++ b/packages/htools/gperf/gperf.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2011-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2011-2014 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,12 +26,11 @@ config EMBTK_HOST_HAVE_GPERF bool help - This is GNU gperf. It is a program that generates perfect hash - functions for sets of key words. - A perfect hash function is: - A hash function and a data structure that allows - recognition of a key word in a set of words using - exactly 1 probe into the data structure. + This is GNU gperf. It is a program that generates perfect hash + functions for sets of key words. + A perfect hash function is: + A hash function and a data structure that allows recognition of a key + word in a set of words using exactly 1 probe into the data structure. if EMBTK_HOST_HAVE_GPERF config EMBTK_GPERF_HOST_VERSION_STRING diff --git a/core/mk/gperf_host.mk b/packages/htools/gperf/gperf.mk index f4ab8c9..42b696b 100644 --- a/core/mk/gperf_host.mk +++ b/packages/htools/gperf/gperf.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2011-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2011-2014 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,8 +28,4 @@ GPERF_HOST_VERSION := $(call embtk_get_pkgversion,gperf_host) GPERF_HOST_SITE := http://ftp.gnu.org/gnu/gperf GPERF_HOST_PACKAGE := gperf-$(GPERF_HOST_VERSION).tar.gz GPERF_HOST_SRC_DIR := $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION) -GPERF_HOST_BUILD_DIR := $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION) - -define embtk_cleanup_gperf_host - rm -rf $(GPERF_HOST_BUILD_DIR) -endef +GPERF_HOST_BUILD_DIR := $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION)-build diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index 1c1a874..5dac98a 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -77,7 +77,7 @@ config EMBTK_HAVE_MKIMAGE # # gperf for host # -source core/kconfig/gperf_host.kconfig +source packages/htools/gperf/gperf.kconfig # # GMP @@ -138,11 +138,6 @@ source packages/htools/pkgconf/pkgconf.kconfig source packages/htools/fakeroot/fakeroot.kconfig # -# gperf for host -# -source core/kconfig/gperf_host.kconfig - -# # libelf # source packages/misc/libelf/libelf.kconfig diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index cde4230..cb66b4c 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -44,3 +44,6 @@ $(call embtk_include_hostpkg,squashfs_host) # zlib $(call embtk_include_hostpkg,zlib_host) + +# gperf +$(call embtk_include_hostpkg,gperf_host) |