diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | package/Makefile.in | 4 | ||||
| -rw-r--r-- | package/atk/atk.mk | 30 | ||||
| -rw-r--r-- | package/cairo/cairo.mk | 30 | ||||
| -rw-r--r-- | package/dbus-glib/dbus-glib.mk | 33 | ||||
| -rw-r--r-- | package/dbus/dbus.mk | 38 | ||||
| -rw-r--r-- | package/expat/expat.mk | 34 | ||||
| -rw-r--r-- | package/fontconfig/fontconfig.mk | 30 | ||||
| -rw-r--r-- | package/freetype/freetype.mk | 30 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 33 | ||||
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 30 | ||||
| -rw-r--r-- | package/pango/pango.mk | 31 | ||||
| -rw-r--r-- | package/pixman/pixman.mk | 30 | ||||
| -rw-r--r-- | package/pkgconfig/pkgconfig.mk | 32 | ||||
| -rw-r--r-- | project/Makefile.in | 3 |
15 files changed, 203 insertions, 195 deletions
@@ -283,7 +283,7 @@ $(BR2_DEPENDS_DIR): .config dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \ - $(PROJECT_BUILD_DIR)/autotools-stamps + $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) $(BASE_TARGETS): dirs @@ -295,7 +295,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL) $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \ $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \ - $(PROJECT_BUILD_DIR)/autotools-stamps + $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) ############################################################# # @@ -304,7 +304,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL) # ############################################################# $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \ - $(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR): + $(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR) $(STAMP_DIR): @mkdir -p $@ $(STAGING_DIR): @@ -365,10 +365,10 @@ external-deps: # ############################################################# clean: $(TARGETS_CLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps + rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) dirclean: $(TARGETS_DIRCLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps + rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR) distclean: ifeq ($(DL_DIR),$(BASE_DIR)/dl) diff --git a/package/Makefile.in b/package/Makefile.in index 38f028742..5a44e3856 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -252,7 +252,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ DEFAULT_LINKER="$(TARGET_LD)" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" \ STAGING_DIR="$(STAGING_DIR)" TARGET_CONFIGURE_ENV=\ @@ -297,7 +297,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \ ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" + PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" HOST_MAKE_ENV=PATH=$(HOST_PATH) diff --git a/package/atk/atk.mk b/package/atk/atk.mk index c9e373e28..0f30ae171 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -59,41 +59,41 @@ $(eval $(call AUTOTARGETS,package,atk)) # atk for the host ATK_HOST_DIR:=$(BUILD_DIR)/atk-$(ATK_VERSION)-host -ATK_HOST_BINARY:=$(HOST_DIR)/usr/lib/libatk-1.0.a -$(ATK_HOST_DIR)/.unpacked: $(DL_DIR)/$(ATK_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_atk_unpacked: $(DL_DIR)/$(ATK_SOURCE) + mkdir -p $(ATK_HOST_DIR) $(INFLATE$(suffix $(ATK_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(ATK_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(ATK_HOST_DIR)/.configured: $(ATK_HOST_DIR)/.unpacked $(LIBGLIB2_HOST_BINARY) $(PKG_CONFIG_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_atk_configured: $(STAMP_DIR)/host_atk_unpacked $(STAMP_DIR)/host_libglib2_installed $(STAMP_DIR)/host_pkgconfig_installed + (cd $(ATK_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --enable-shared \ --disable-static \ --disable-glibtest \ ) touch $@ -$(ATK_HOST_DIR)/.compiled: $(ATK_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_atk_compiled: $(STAMP_DIR)/host_atk_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(ATK_HOST_DIR) touch $@ -$(ATK_HOST_BINARY): $(ATK_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_atk_installed: $(STAMP_DIR)/host_atk_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(ATK_HOST_DIR) install + touch $@ -host-atk: $(ATK_HOST_BINARY) +host-atk: $(STAMP_DIR)/host_atk_installed host-atk-source: atk-source host-atk-clean: - rm -f $(addprefix $(ATK_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_atk_,unpacked configured compiled installed) -$(MAKE) -C $(ATK_HOST_DIR) uninstall -$(MAKE) -C $(ATK_HOST_DIR) clean diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index c2fb35d66..8cfa84669 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -86,22 +86,21 @@ $(eval $(call AUTOTARGETS,package,cairo)) # cairo for the host CAIRO_HOST_DIR:=$(BUILD_DIR)/cairo-$(CAIRO_VERSION)-host -CAIRO_HOST_BINARY:=$(HOST_DIR)/usr/lib/libcairo.a -$(CAIRO_HOST_DIR)/.unpacked: $(DL_DIR)/$(CAIRO_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_cairo_unpacked: $(DL_DIR)/$(CAIRO_SOURCE) + mkdir -p $(CAIRO_HOST_DIR) $(INFLATE$(suffix $(CAIRO_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(CAIRO_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(CAIRO_HOST_DIR)/.configured: $(CAIRO_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) $(FONTCONFIG_HOST_BINARY) $(PIXMAN_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_cairo_configured: $(STAMP_DIR)/host_cairo_unpacked $(STAMP_DIR)/host_pkgconfig_installed $(STAMP_DIR)/host_fontconfig_installed $(STAMP_DIR)/host_pixman_installed + (cd $(CAIRO_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --enable-ps \ --enable-pdf \ --enable-xlib \ @@ -111,19 +110,20 @@ $(CAIRO_HOST_DIR)/.configured: $(CAIRO_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BIN ) touch $@ -$(CAIRO_HOST_DIR)/.compiled: $(CAIRO_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_cairo_compiled: $(STAMP_DIR)/host_cairo_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(CAIRO_HOST_DIR) touch $@ -$(CAIRO_HOST_BINARY): $(CAIRO_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_cairo_installed: $(STAMP_DIR)/host_cairo_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(CAIRO_HOST_DIR) install + touch $@ -host-cairo: $(CAIRO_HOST_BINARY) +host-cairo: $(STAMP_DIR)/host_cairo_installed host-cairo-source: cairo-source host-cairo-clean: - rm -f $(addprefix $(CAIRO_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_cairo_,unpacked configured compiled installed) -$(MAKE) -C $(CAIRO_HOST_DIR) uninstall -$(MAKE) -C $(CAIRO_HOST_DIR) clean diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index f0fc017cb..7cbc901cc 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -31,20 +31,20 @@ $(eval $(call AUTOTARGETS,package,dbus-glib)) DBUS_GLIB_HOST_DIR:=$(BUILD_DIR)/dbus-glib-$(DBUS_GLIB_VERSION)-host DBUS_GLIB_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-binding-tool -$(DBUS_GLIB_HOST_DIR)/.unpacked: $(DL_DIR)/$(DBUS_GLIB_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_dbusglib_unpacked: $(DL_DIR)/$(DBUS_GLIB_SOURCE) + mkdir -p $(DBUS_GLIB_HOST_DIR) $(INFLATE$(suffix $(DBUS_GLIB_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(DBUS_GLIB_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(DBUS_GLIB_HOST_DIR)/.configured: $(DBUS_GLIB_HOST_DIR)/.unpacked $(EXPAT_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_dbusglib_configured: $(STAMP_DIR)/host_dbusglib_unpacked $(STAMP_DIR)/host_dbus_installed + (cd $(DBUS_GLIB_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --disable-tests \ --disable-xml-docs \ --disable-bash-completion \ @@ -53,21 +53,22 @@ $(DBUS_GLIB_HOST_DIR)/.configured: $(DBUS_GLIB_HOST_DIR)/.unpacked $(EXPAT_HOST_ ) touch $@ -$(DBUS_GLIB_HOST_DIR)/.compiled: $(DBUS_GLIB_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_dbusglib_compiled: $(STAMP_DIR)/host_dbusglib_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(DBUS_GLIB_HOST_DIR) touch $@ -$(DBUS_GLIB_HOST_BINARY): $(DBUS_GLIB_HOST_DIR)/.compiled - $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_dbusglib_installed: $(STAMP_DIR)/host_dbusglib_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(DBUS_GLIB_HOST_DIR) install + touch $@ -host-dbus-glib: $(DBUS_GLIB_HOST_BINARY) +host-dbus-glib: $(STAMP_DIR)/host_dbusglib_installed host-dbus-glib-source: dbus-glib-source host-dbus-glib-clean: - rm -f $(addprefix $(DBUS_GLIB_HOST_DIR)/,.unpacked .configured .compiled) - $(MAKE) -C $(DBUS_GLIB_HOST_DIR) uninstall - $(MAKE) -C $(DBUS_GLIB_HOST_DIR) clean + rm -f $(addprefix $(STAMP_DIR)/host_dbusglib_,unpacked configured compiled installed) + -$(MAKE) -C $(DBUS_GLIB_HOST_DIR) uninstall + -$(MAKE) -C $(DBUS_GLIB_HOST_DIR) clean host-dbus-glib-dirclean: rm -rf $(DBUS_GLIB_HOST_DIR) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 02ad624f3..af82bf2bd 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -56,23 +56,22 @@ $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET) # dbus for the host DBUS_HOST_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)-host -DBUS_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-daemon DBUS_HOST_INTROSPECT:=$(DBUS_HOST_DIR)/introspect.xml -$(DBUS_HOST_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_dbus_unpacked: $(DL_DIR)/$(DBUS_SOURCE) + mkdir -p $(DBUS_HOST_DIR) $(INFLATE$(suffix $(DBUS_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(DBUS_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(DBUS_HOST_DIR)/.configured: $(DBUS_HOST_DIR)/.unpacked $(EXPAT_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_dbus_configured: $(DBUS_HOST_DIR)/.unpacked $(STAMP_DIR)/host_expat_installed $(STAMP_DIR)/host_pkgconfig_installed + (cd $(DBUS_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --with-dbus-user=dbus \ --disable-tests \ --disable-asserts \ @@ -87,25 +86,24 @@ $(DBUS_HOST_DIR)/.configured: $(DBUS_HOST_DIR)/.unpacked $(EXPAT_HOST_BINARY) ) touch $@ -$(DBUS_HOST_DIR)/.compiled: $(DBUS_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_dbus_compiled: $(STAMP_DIR)/host_dbus_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(DBUS_HOST_DIR) touch $@ -$(DBUS_HOST_BINARY): $(DBUS_HOST_DIR)/.compiled - $(MAKE) -C $(<D) install - -$(DBUS_HOST_INTROSPECT): $(DBUS_HOST_BINARY) - $(DBUS_HOST_BINARY) --introspect > $@ +$(STAMP_DIR)/host_dbus_installed: $(STAMP_DIR)/host_dbus_compiled + $(MAKE) -C $(DBUS_HOST_DIR) install + $(HOST_DIR)/usr/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT) + touch $@ -host-dbus: $(DBUS_HOST_INTROSPECT) +host-dbus: $(STAMP_DIR)/host_dbus_installed host-dbus-source: dbus-source host-dbus-clean: - rm -f $(addprefix $(DBUS_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_dbus_,unpacked configured compiled installed) rm -f $(DBUS_HOST_INTROSPECT) - $(MAKE) -C $(DBUS_HOST_DIR) uninstall - $(MAKE) -C $(DBUS_HOST_DIR) clean + -$(MAKE) -C $(DBUS_HOST_DIR) uninstall + -$(MAKE) -C $(DBUS_HOST_DIR) clean host-dbus-dirclean: rm -rf $(DBUS_HOST_DIR) diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 4028a8f08..95383e610 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -26,40 +26,40 @@ $(EXPAT_HOOK_POST_INSTALL): $(EXPAT_TARGET_INSTALL_TARGET) # expat for the host EXPAT_HOST_DIR:=$(BUILD_DIR)/expat-$(EXPAT_VERSION)-host -EXPAT_HOST_BINARY:=$(HOST_DIR)/usr/lib/libexpat.a -$(EXPAT_HOST_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_expat_unpacked: $(DL_DIR)/$(EXPAT_SOURCE) + mkdir -p $(EXPAT_HOST_DIR) $(INFLATE$(suffix $(EXPAT_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(EXPAT_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(EXPAT_HOST_DIR)/.configured: $(EXPAT_HOST_DIR)/.unpacked - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_expat_configured: $(STAMP_DIR)/host_expat_unpacked + (cd $(EXPAT_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ ) touch $@ -$(EXPAT_HOST_DIR)/.compiled: $(EXPAT_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_expat_compiled: $(STAMP_DIR)/host_expat_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(EXPAT_HOST_DIR) touch $@ -$(EXPAT_HOST_BINARY): $(EXPAT_HOST_DIR)/.compiled - $(MAKE) -C $(<D) installlib +$(STAMP_DIR)/host_expat_installed: $(STAMP_DIR)/host_expat_compiled + $(MAKE) -C $(EXPAT_HOST_DIR) installlib + touch $@ -host-expat: $(EXPAT_HOST_BINARY) +host-expat: $(STAM_DIR)/host_expat_installed host-expat-source: expat-source host-expat-clean: - rm -f $(addprefix $(EXPAT_HOST_DIR)/,.unpacked .configured .compiled) - $(MAKE) -C $(EXPAT_HOST_DIR) uninstall - $(MAKE) -C $(EXPAT_HOST_DIR) clean + rm -f $(addprefix $(STAMP_DIR)/host_expat_,unpacked configured compiled installed) + -$(MAKE) -C $(EXPAT_HOST_DIR) uninstall + -$(MAKE) -C $(EXPAT_HOST_DIR) clean host-expat-dirclean: rm -rf $(EXPAT_HOST_DIR) diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 81181cc8b..b6e87f976 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -27,40 +27,40 @@ $(eval $(call AUTOTARGETS,package,fontconfig)) # fontconfig for the host FONTCONFIG_HOST_DIR:=$(BUILD_DIR)/fontconfig-$(FONTCONFIG_VERSION)-host -FONTCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/fc-cache -$(FONTCONFIG_HOST_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_fontconfig_unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE) + mkdir -p $(FONTCONFIG_HOST_DIR) $(INFLATE$(suffix $(FONTCONFIG_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(FONTCONFIG_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(FONTCONFIG_HOST_DIR)/.configured: $(FONTCONFIG_HOST_DIR)/.unpacked $(FREETYPE_HOST_BINARY) $(EXPAT_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_fontconfig_configured: $(STAMP_DIR)/host_fontconfig_unpacked $(STAMP_DIR)/host_freetype_installed $(STAMP_DIR)/host_expat_installed + (cd $(FONTCONFIG_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --disable-docs \ --disable-static \ ) touch $@ -$(FONTCONFIG_HOST_DIR)/.compiled: $(FONTCONFIG_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_fontconfig_compiled: $(STAMP_DIR)/host_fontconfig_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(FONTCONFIG_HOST_DIR) touch $@ -$(FONTCONFIG_HOST_BINARY): $(FONTCONFIG_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_fontconfig_installed: $(STAMP_DIR)/host_fontconfig_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(FONTCONFIG_HOST_DIR) install + touch $@ -host-fontconfig: $(FONTCONFIG_HOST_BINARY) +host-fontconfig: $(STAMP_DIR)/host_fontconfig_installed host-fontconfig-source: fontconfig-source host-fontconfig-clean: - rm -f $(addprefix $(FONTCONFIG_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_fontconfig_,unpacked configured compiled installed) -$(MAKE) -C $(FONTCONFIG_HOST_DIR) uninstall -$(MAKE) -C $(FONTCONFIG_HOST_DIR) clean diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 608787619..774471f6a 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -25,38 +25,38 @@ $(FREETYPE_HOOK_POST_INSTALL): # freetype for the host FREETYPE_HOST_DIR:=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION)-host -FREETYPE_HOST_BINARY:=$(HOST_DIR)/usr/bin/freetype-config -$(FREETYPE_HOST_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_freetype_unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) + mkdir -p $(FREETYPE_HOST_DIR) $(INFLATE$(suffix $(FREETYPE_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(FREETYPE_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(FREETYPE_HOST_DIR)/.configured: $(FREETYPE_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_freetype_configured: $(STAMP_DIR)/host_freetype_unpacked $(STAMP_DIR)/host_pkgconfig_installed + (cd $(FREETYPE_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ ) touch $@ -$(FREETYPE_HOST_DIR)/.compiled: $(FREETYPE_HOST_DIR)/.configured - $(MAKE) -C $(@D) +$(STAMP_DIR)/host_freetype_compiled: $(STAMP_DIR)/host_freetype_configured + $(MAKE) -C $(FREETYPE_HOST_DIR) touch $@ -$(FREETYPE_HOST_BINARY): $(FREETYPE_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_freetype_installed: $(STAMP_DIR)/host_freetype_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(FREETYPE_HOST_DIR) install + touch $@ -host-freetype: $(FREETYPE_HOST_BINARY) +host-freetype: $(STAMP_DIR)/host_freetype_installed host-freetype-source: freetype-source host-freetype-clean: - rm -f $(addprefix $(FREETYPE_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_freetype_,unpacked configured compiled installed) -$(MAKE) -C $(FREETYPE_HOST_DIR) uninstall -$(MAKE) -C $(FREETYPE_HOST_DIR) clean diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 6b4aa8811..90d4fd84a 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -68,20 +68,20 @@ $(eval $(call AUTOTARGETS,package,libglib2)) LIBGLIB2_HOST_DIR:=$(BUILD_DIR)/libglib2-$(LIBGLIB2_VERSION)-host LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal -$(LIBGLIB2_HOST_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB2_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_libglib2_unpacked: $(DL_DIR)/$(LIBGLIB2_SOURCE) + mkdir -p $(LIBGLIB2_HOST_DIR) $(INFLATE$(suffix $(LIBGLIB2_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LIBGLIB2_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(LIBGLIB2_HOST_DIR)/.configured: $(LIBGLIB2_HOST_DIR)/.unpacked - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_libglib2_configured: $(STAMP_DIR)/host_libglib2_unpacked $(STAMP_DIR)/host_pkgconfig_installed + (cd $(LIBGLIB2_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --enable-shared \ --disable-static \ --disable-gtk-doc \ @@ -89,21 +89,22 @@ $(LIBGLIB2_HOST_DIR)/.configured: $(LIBGLIB2_HOST_DIR)/.unpacked ) touch $@ -$(LIBGLIB2_HOST_DIR)/.compiled: $(LIBGLIB2_HOST_DIR)/.configured - $(MAKE) -C $(@D) +$(STAMP_DIR)/host_libglib2_compiled: $(STAMP_DIR)/host_libglib2_configured + $(MAKE) -C $(LIBGLIB2_HOST_DIR) touch $@ -$(LIBGLIB2_HOST_BINARY): $(LIBGLIB2_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_libglib2_installed: $(STAMP_DIR)/host_libglib2_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(LIBGLIB2_HOST_DIR) install + touch $@ -host-libglib2: $(LIBGLIB2_HOST_BINARY) +host-libglib2: $(STAMP_DIR)/host_libglib2_installed host-libglib2-source: libglib2-source host-libglib2-clean: - rm -f $(addprefix $(LIBGLIB2_HOST_DIR)/,.unpacked .configured .compiled) - $(MAKE) -C $(LIBGLIB2_HOST_DIR) uninstall - $(MAKE) -C $(LIBGLIB2_HOST_DIR) clean + rm -f $(addprefix $(STAMP_DIR)/host_libglib2_,unpacked configured compiled installed) + -$(MAKE) -C $(LIBGLIB2_HOST_DIR) uninstall + -$(MAKE) -C $(LIBGLIB2_HOST_DIR) clean host-libglib2-dirclean: rm -rf $(LIBGLIB2_HOST_DIR) diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index b656c8557..b8a42ff43 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -134,22 +134,21 @@ $(LIBGTK2_HOOK_POST_INSTALL): # libgtk2 for the host LIBGTK2_HOST_DIR:=$(BUILD_DIR)/libgtk2-$(LIBGTK2_VERSION)-host -LIBGTK2_HOST_BINARY:=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource -$(LIBGTK2_HOST_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_libgtk2_unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE) + mkdir -p $(LIBGTK2_HOST_DIR) $(INFLATE$(suffix $(LIBGTK2_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LIBGTK2_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(LIBGTK2_HOST_DIR)/.configured: $(LIBGTK2_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY) $(PANGO_HOST_BINARY) $(ATK_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_libgtk2_configured: $(STAMP_DIR)/host_libgtk2_unpacked $(STAMP_DIR)/host_cairo_installed $(STAMP_DIR)/host_libglib2_installed $(STAMP_DIR)/host_pango_installed $(STAMP_DIR)/host_atk_installed + (cd $(LIBGTK2_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --disable-static \ --disable-glibtest \ --without-libtiff \ @@ -162,19 +161,20 @@ $(LIBGTK2_HOST_DIR)/.configured: $(LIBGTK2_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST ) touch $@ -$(LIBGTK2_HOST_DIR)/.compiled: $(LIBGTK2_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_libgtk2_compiled: $(STAMP_DIR)/host_libgtk2_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(LIBGTK2_HOST_DIR) touch $@ -$(LIBGTK2_HOST_BINARY): $(LIBGTK2_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_libgtk2_installed: $(STAMP_DIR)/host_libgtk2_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(LIBGTK2_HOST_DIR) install + touch $@ -host-libgtk2: $(LIBGTK2_HOST_BINARY) +host-libgtk2: $(STAMP_DIR)/host_libgtk2_installed host-libgtk2-source: libgtk2-source host-libgtk2-clean: - rm -f $(addprefix $(LIBGTK2_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_libgtk2_,unpacked configured compiled installed) -$(MAKE) -C $(LIBGTK2_HOST_DIR) uninstall -$(MAKE) -C $(LIBGTK2_HOST_DIR) clean diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 2db730e49..b64d1a234 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -66,40 +66,41 @@ $(PANGO_HOOK_POST_INSTALL): PANGO_HOST_DIR:=$(BUILD_DIR)/pango-$(PANGO_VERSION)-host PANGO_HOST_BINARY:=$(HOST_DIR)/usr/bin/pango-querymodules -$(PANGO_HOST_DIR)/.unpacked: $(DL_DIR)/$(PANGO_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_pango_unpacked: $(DL_DIR)/$(PANGO_SOURCE) + mkdir -p $(PANGO_HOST_DIR) $(INFLATE$(suffix $(PANGO_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(@D) package/pango/ \*.patch + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(PANGO_HOST_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(PANGO_HOST_DIR) package/pango/ \*.patch touch $@ -$(PANGO_HOST_DIR)/.configured: $(PANGO_HOST_DIR)/.unpacked $(PKG_CONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY) - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_pango_configured: $(STAMP_DIR)/host_pango_unpacked $(STAMP_DIR)/host_cairo_installed $(STAMP_DIR)/host_libglib2_installed + (cd $(PANGO_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --disable-static \ $(if $(BR2_PACKAGE_XSERVER_none),--without-x,--with-x) \ --disable-debug \ ) touch $@ -$(PANGO_HOST_DIR)/.compiled: $(PANGO_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_pango_compiled: $(STAMP_DIR)/host_pango_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(PANGO_HOST_DIR) touch $@ -$(PANGO_HOST_BINARY): $(PANGO_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_pango_installed: $(STAMP_DIR)/host_pango_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(PANGO_HOST_DIR) install + touch $@ -host-pango: $(PANGO_HOST_BINARY) +host-pango: $(STAMP_DIR)/host_pango_installed host-pango-source: pango-source host-pango-clean: - rm -f $(addprefix $(PANGO_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_pango_,unpacked configured compiled installed) -$(MAKE) -C $(PANGO_HOST_DIR) uninstall -$(MAKE) -C $(PANGO_HOST_DIR) clean diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 0b20353bf..9270e6cef 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -13,38 +13,38 @@ $(eval $(call AUTOTARGETS,package,pixman)) # pixman for the host PIXMAN_HOST_DIR:=$(BUILD_DIR)/pixman-$(PIXMAN_VERSION)-host -PIXMAN_HOST_BINARY:=$(HOST_DIR)/usr/lib/libpixman-1.0.a -$(PIXMAN_HOST_DIR)/.unpacked: $(DL_DIR)/$(PIXMAN_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_pixman_unpacked: $(DL_DIR)/$(PIXMAN_SOURCE) + mkdir -p $(PIXMAN_HOST_DIR) $(INFLATE$(suffix $(PIXMAN_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(PIXMAN_HOST_DIR) $(TAR_OPTIONS) - touch $@ -$(PIXMAN_HOST_DIR)/.configured: $(PIXMAN_HOST_DIR)/.unpacked - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_pixman_configured: $(STAMP_DIR)/host_pixman_unpacked + (cd $(PIXMAN_HOST_DIR); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - $(@D)/configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ ) touch $@ -$(PIXMAN_HOST_DIR)/.compiled: $(PIXMAN_HOST_DIR)/.configured - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +$(STAMP_DIR)/host_pixman_compiled: $(STAMP_DIR)/host_pixman_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(PIXMAN_HOST_DIR) touch $@ -$(PIXMAN_HOST_BINARY): $(PIXMAN_HOST_DIR)/.compiled - $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_pixman_installed: $(STAMP_DIR)/host_pixman_compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(PIXMAN_HOST_DIR) install + touch $@ -host-pixman: $(PIXMAN_HOST_BINARY) +host-pixman: $(STAMP_DIR)/host_pixman_installed host-pixman-source: pixman-source host-pixman-clean: - rm -f $(addprefix $(PIXMAN_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_pixman_,unpacked configured compiled installed) -$(MAKE) -C $(PIXMAN_HOST_DIR) uninstall -$(MAKE) -C $(PIXMAN_HOST_DIR) clean diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index 6c89952c5..206de65c1 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -21,34 +21,38 @@ $(eval $(call AUTOTARGETS,package,pkgconfig)) PKG_CONFIG_HOST_DIR:=$(BUILD_DIR)/pkg-config-$(PKG_CONFIG_VERSION)-host PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config -$(PKG_CONFIG_HOST_DIR)/.unpacked: $(DL_DIR)/$(PKG_CONFIG_SOURCE) - mkdir -p $(@D) +$(STAMP_DIR)/host_pkgconfig_unpacked: $(DL_DIR)/$(PKG_CONFIG_SOURCE) + mkdir -p $(PKG_CONFIG_HOST_DIR) $(INFLATE$(suffix $(PKG_CONFIG_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(@D) package/pkgconfig/ \*.patch + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(PKG_CONFIG_HOST_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(PKG_CONFIG_HOST_DIR) package/pkgconfig/ \*.patch touch $@ -$(PKG_CONFIG_HOST_DIR)/.configured: $(PKG_CONFIG_HOST_DIR)/.unpacked - (cd $(@D); rm -rf config.cache; \ +$(STAMP_DIR)/host_pkgconfig_configured: $(STAMP_DIR)/host_pkgconfig_unpacked + (cd $(PKG_CONFIG_HOST_DIR); rm -rf config.cache; \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ ./configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(HOST_DIR)/etc \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ --with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig" \ --disable-static \ ) touch $@ -$(PKG_CONFIG_HOST_DIR)/.compiled: $(PKG_CONFIG_HOST_DIR)/.configured - $(MAKE) -C $(@D) +$(STAMP_DIR)/host_pkgconfig_compiled: $(STAMP_DIR)/host_pkgconfig_configured + $(MAKE) -C $(PKG_CONFIG_HOST_DIR) touch $@ -$(PKG_CONFIG_HOST_BINARY): $(PKG_CONFIG_HOST_DIR)/.compiled - $(MAKE) -C $(<D) install +$(STAMP_DIR)/host_pkgconfig_installed: $(STAMP_DIR)/host_pkgconfig_compiled + $(MAKE) -C $(PKG_CONFIG_HOST_DIR) install + touch $@ -host-pkgconfig: $(PKG_CONFIG_HOST_BINARY) +host-pkgconfig: $(STAMP_DIR)/host_pkgconfig_installed host-pkgconfig-clean: - rm -f $(addprefix $(PKG_CONFIG_HOST_DIR)/,.unpacked .configured .compiled) + rm -f $(addprefix $(STAMP_DIR)/host_pkgconfig_,unpacked configured compiled installed) -$(MAKE) -C $(PKG_CONFIG_HOST_DIR) uninstall -$(MAKE) -C $(PKG_CONFIG_HOST_DIR) clean diff --git a/project/Makefile.in b/project/Makefile.in index a3a666493..49aec141a 100644 --- a/project/Makefile.in +++ b/project/Makefile.in @@ -71,6 +71,9 @@ STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR))) # packages compiled for the host goes here HOST_DIR:=$(BUILD_DIR)/host_dir +# stamp (dependency) files go here +STAMP_DIR:=$(BUILD_DIR)/stamps + # All configurable packages (like Busybox,Linux etc) should be built # in PROJECT_BUILD_DIR PROJECT_BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)project_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)/$(PROJECT) |