diff options
Diffstat (limited to 'package/x11r7')
| -rw-r--r-- | package/x11r7/xfont_font-util/xfont_font-util.mk | 2 | ||||
| -rw-r--r-- | package/x11r7/xproto_xproto/xproto_xproto.mk | 44 | ||||
| -rw-r--r-- | package/x11r7/xutil_makedepend/xutil_makedepend.mk | 46 |
3 files changed, 5 insertions, 87 deletions
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index 0c9dc29a9..38e7e80a7 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -59,7 +59,7 @@ $(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed ( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) ) touch $@ -xfont_font-util: host-pkgconfig $(XFONT_FONT_UTIL_DIR)/.hacked +xfont_font-util: host-pkg-config $(XFONT_FONT_UTIL_DIR)/.hacked xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk index 879b55453..ff2a042b2 100644 --- a/package/x11r7/xproto_xproto/xproto_xproto.mk +++ b/package/x11r7/xproto_xproto/xproto_xproto.mk @@ -12,46 +12,4 @@ XPROTO_XPROTO_INSTALL_STAGING = YES XPROTO_XPROTO_INSTALL_TARGET = NO $(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto)) - -# xproto_xproto for the host -XPROTO_XPROTO_HOST_DIR:=$(BUILD_DIR)/xproto_xproto-$(XPROTO_XPROTO_VERSION)-host - -$(DL_DIR)/$(XPROTO_XPROTO_SOURCE): - $(call DOWNLOAD,$(XPROTO_XPROTO_SITE),$(XPROTO_XPROTO_SOURCE)) - -$(STAMP_DIR)/host_xproto_xproto_unpacked: $(DL_DIR)/$(XPROTO_XPROTO_SOURCE) - mkdir -p $(XPROTO_XPROTO_HOST_DIR) - $(INFLATE$(suffix $(XPROTO_XPROTO_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(XPROTO_XPROTO_HOST_DIR) $(TAR_OPTIONS) - - touch $@ - -$(STAMP_DIR)/host_xproto_xproto_configured: $(STAMP_DIR)/host_xproto_xproto_unpacked - (cd $(XPROTO_XPROTO_HOST_DIR); rm -rf config.cache; \ - $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - ./configure $(QUIET) \ - --prefix="$(HOST_DIR)/usr" \ - --sysconfdir="$(HOST_DIR)/etc" \ - ) - touch $@ - -$(STAMP_DIR)/host_xproto_xproto_compiled: $(STAMP_DIR)/host_xproto_xproto_configured - $(HOST_MAKE_ENV) $(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) - touch $@ - -$(STAMP_DIR)/host_xproto_xproto_installed: $(STAMP_DIR)/host_xproto_xproto_compiled - $(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) install - touch $@ - -host-xproto_xproto: $(STAMP_DIR)/host_xproto_xproto_installed - -host-xproto_xproto-source: xproto_xproto-source - -host-xproto_xproto-clean: - rm -f $(addprefix $(STAMP_DIR)/host_xproto_xproto_,unpacked configured compiled installed) - -$(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) uninstall - -$(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) clean - -host-xproto_xproto-dirclean: - rm -rf $(XPROTO_XPROTO_HOST_DIR) +$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto,host)) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index edbe2514d..b0bbafd10 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -11,47 +11,7 @@ XUTIL_MAKEDEPEND_AUTORECONF = NO XUTIL_MAKEDEPEND_INSTALL_STAGING = NO XUTIL_MAKEDEPEND_INSTALL_TARGET = YES -$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend)) - -# makedepend for the host -MAKEDEPEND_HOST_DIR:=$(BUILD_DIR)/makedepend-$(XUTIL_MAKEDEPEND_VERSION)-host - -$(DL_DIR)/$(XUTIL_MAKEDEPEND_SOURCE): - $(call DOWNLOAD,$(XUTIL_MAKEDEPEND_SITE),$(XUTIL_MAKEDEPEND_SOURCE)) - -$(STAMP_DIR)/host_makedepend_unpacked: $(DL_DIR)/$(XUTIL_MAKEDEPEND_SOURCE) - mkdir -p $(MAKEDEPEND_HOST_DIR) - $(INFLATE$(suffix $(XUTIL_MAKEDEPEND_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(MAKEDEPEND_HOST_DIR) $(TAR_OPTIONS) - - touch $@ - -$(STAMP_DIR)/host_makedepend_configured: $(STAMP_DIR)/host_makedepend_unpacked $(STAMP_DIR)/host_xproto_xproto_installed - (cd $(MAKEDEPEND_HOST_DIR); rm -rf config.cache; \ - $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - ./configure $(QUIET) \ - --prefix="$(HOST_DIR)/usr" \ - --sysconfdir="$(HOST_DIR)/etc" \ - ) - touch $@ - -$(STAMP_DIR)/host_makedepend_compiled: $(STAMP_DIR)/host_makedepend_configured - $(HOST_MAKE_ENV) $(MAKE) -C $(MAKEDEPEND_HOST_DIR) - touch $@ +HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto-xproto -$(STAMP_DIR)/host_makedepend_installed: $(STAMP_DIR)/host_makedepend_compiled - $(MAKE) -C $(MAKEDEPEND_HOST_DIR) install - touch $@ - -host-makedepend: $(STAMP_DIR)/host_makedepend_installed - -host-makedepend-source: makedepend-source - -host-makedepend-clean: - rm -f $(addprefix $(STAMP_DIR)/host_makedepend_,unpacked configured compiled installed) - -$(MAKE) -C $(MAKEDEPEND_HOST_DIR) uninstall - -$(MAKE) -C $(MAKEDEPEND_HOST_DIR) clean - -host-makedepend-dirclean: - rm -rf $(MAKEDEPEND_HOST_DIR) +$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend)) +$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend,host)) |