diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-19 11:06:47 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-19 11:06:47 +0000 |
| commit | e7b38c71ce55720f7709f0049f5bfc71ca0615ec (patch) | |
| tree | 2ce70187ad1380f02c1777e7da3a48fb16d9f26a /package/fontconfig | |
| parent | f58ff9a25f24576e032c65d762e5b8fdd2cf5c1c (diff) | |
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.
Diffstat (limited to 'package/fontconfig')
| -rw-r--r-- | package/fontconfig/fontconfig.mk | 30 |
1 files changed, 15 insertions, 15 deletions
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 |