package: add STAMP_DIR and use for host builds

Move stamp (dependency) files outside the (version specific) source
directories, so other packages can hardcode dependencies on them instead
of having to use <PACKAGE>_VERSION variables.

This is important as the variables in the make rules are evaluated when
the rules is seen, which might be before the dependent makefile is parsed
(and hence <PACKAGE>_VERSION variable is known, screwing up stuff.

The downside of this is that the package isn't automatically rebuilt
when the version changes (E.G. by a svn update) and you now also have to
remove the stamp files next to $(BUILD_DIR)/<PACKAGE>-* to force a rebuild.
This commit is contained in:
Peter Korsgaard
2009-03-19 11:06:47 +00:00
parent f58ff9a25f
commit e7b38c71ce
15 changed files with 203 additions and 195 deletions

View File

@@ -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