diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-09 17:30:14 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-09 17:36:44 +0100 |
| commit | 6e8142d2976abf4e81ffefa8c9c59d664788a4c2 (patch) | |
| tree | 9dd065f32f2164fa5feda2dae75cb313f682a1a3 | |
| parent | 0e0bb59ab561708efc2ae15729cd0788850dca5f (diff) | |
| download | embtoolkit-6e8142d2976abf4e81ffefa8c9c59d664788a4c2.tar.gz embtoolkit-6e8142d2976abf4e81ffefa8c9c59d664788a4c2.tar.bz2 embtoolkit-6e8142d2976abf4e81ffefa8c9c59d664788a4c2.tar.xz | |
Embtk: simplify configure macro
This patch simplifies configure macro by taking advantage of
variables defined by packages (XXXX_NAME, XXXX_VERSION, etc.).
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.mk | 25 | ||||
| -rw-r--r-- | packages/database/sqlite/sqlite.mk | 7 | ||||
| -rw-r--r-- | packages/misc/foo/foo.mk | 6 |
3 files changed, 15 insertions, 23 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 0ddb5b5..72de6a0 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -94,6 +94,9 @@ define EMBTK_GENERIC_MESSAGE $(call ECHO_BLUE,"# EmbToolkit # $(1)") $(call ECHO_BLUE,"################################################################################") endef +define EMBTK_GENERIC_MSG + $(call EMBTK_GENERIC_MESSAGE,$(1)) +endef #Successful build of EmbToolkit message successful_build: @@ -203,21 +206,17 @@ endef # A macro which runs configure script (conpatible with autotools configure) # for a package and sets environment variables correctly. # Usage: -# $(call EMBTK_CONFIGURE_PKG, \ -# $(PKG_TARBALL), \ -# $(PKG_BUILD_DIR), \ -# $(PKG_SRC_DIR), \ -# $(PKG_CONFIGURE_OPTIONS)) +# $(call EMBTK_CONFIGURE_PKG,PACKAGE) define EMBTK_PRINT_CONFIGURE_OPTS $(call ECHO_BLUE,"Configure options:") @for i in `echo $(1) | tr " " "\n"`; \ do echo -e $(EMBTK_COLOR_BLUE)$$i$(EMBTK_NO_COLOR); done endef define EMBTK_CONFIGURE_PKG - $(call EMBTK_GENERIC_MESSAGE,"Configure $(strip $(1))...") - @test -e $(strip $(3))/configure || exit 1 - $(call EMBTK_PRINT_CONFIGURE_OPTS,"$(strip $(4))") - @cd $(strip $(2)); \ + $(call EMBTK_GENERIC_MSG,"Configure $($(1)_PACKAGE)...") + @test -e $($(1)_SRC_DIR)/configure || exit 1 + $(call EMBTK_PRINT_CONFIGURE_OPTS,"$($(1)_CONFIGURE_OPTS)") + @cd $($(1)_BUILD_DIR); \ CC=$(TARGETCC_CACHED) \ CXX=$(TARGETCXX_CACHED) \ AR=$(TARGETAR) \ @@ -234,10 +233,10 @@ define EMBTK_CONFIGURE_PKG CPPFLAGS="-I$(SYSROOT)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - $(CONFIG_SHELL) $(strip $(3))/configure \ + $(CONFIG_SHELL) $($(1)_SRC_DIR)/configure \ --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ - --prefix=/usr $(strip $(4)) - @touch $(strip $(2))/.configured - $(call EMBTK_KILL_LT_RPATH,$(strip $(2))) + --prefix=/usr $($(1)_CONFIGURE_OPTS) + @touch $($(1)_BUILD_DIR)/.configured + $(call EMBTK_KILL_LT_RPATH,"$($(1)_BUILD_DIR)") endef diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk index 1877cb3..07520b4 100644 --- a/packages/database/sqlite/sqlite.mk +++ b/packages/database/sqlite/sqlite.mk @@ -23,6 +23,7 @@ # \date October 2010 ################################################################################ +SQLITE_NAME := sqlite SQLITE_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_SQLITE_VERSION_STRING))) SQLITE_SITE := http://www.sqlite.org SQLITE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/sqlite/$(SQLITE_VERSION) @@ -79,11 +80,7 @@ endif @touch $@ $(SQLITE_BUILD_DIR)/.configured: - $(call EMBTK_CONFIGURE_PKG, \ - $(SQLITE_PACKAGE), \ - $(SQLITE_BUILD_DIR), \ - $(SQLITE_SRC_DIR), \ - $(SQLITE_CONFIGURE_OPTS)) + $(call EMBTK_CONFIGURE_PKG,SQLITE) sqlite_clean: $(call EMBTK_GENERIC_MESSAGE,"cleanup sqlite...") diff --git a/packages/misc/foo/foo.mk b/packages/misc/foo/foo.mk index ebf5db4..65f6424 100644 --- a/packages/misc/foo/foo.mk +++ b/packages/misc/foo/foo.mk @@ -77,11 +77,7 @@ endif @touch $@ $(FOO_BUILD_DIR)/.configured: - $(call EMBTK_CONFIGURE_PKG, \ - $(FOO_PACKAGE), \ - $(FOO_BUILD_DIR), \ - $(FOO_SRC_DIR), \ - $(FOO_CONFIGURE_OPTS)) + $(call EMBTK_CONFIGURE_PKG,FOO) foo_clean: $(call EMBTK_GENERIC_MESSAGE,"cleanup foo...") |