From 02c5d11736784ed7edf7258381efb4fad31d7602 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 14 Aug 2007 06:28:01 +0000 Subject: Add links to 'usr/include/freetype2/freetype' to 'include' and 'usr/include'. Add PHONY targets --- package/freetype/freetype.mk | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index fafd73796..cf7bac555 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -14,8 +14,6 @@ FREETYPE_HOST_DIR:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION)-host $(DL_DIR)/$(FREETYPE_SOURCE): $(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE) -freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE) - $(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(FREETYPE_DIR)/.unpacked @@ -48,6 +46,12 @@ $(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR) touch $(FREETYPE_DIR)/.compiled +$(STAGING_DIR)/usr/include/freetype: + ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype + +$(STAGING_DIR)/include/freetype: + ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype + $(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libfreetype.la @@ -85,9 +89,13 @@ $(FREETYPE_HOST_DIR)/lib/libfreetype.so: $(FREETYPE_DIR1)/.configured $(MAKE) -C $(FREETYPE_DIR1) install touch -c $@ -host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so +.PHONY: freetype freetype-source freetype-links freetype-clean freetype-dirclean -freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so +freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so freetype-links + +freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE) + +freetype-links: $(STAGING_DIR)/usr/include/freetype $(STAGING_DIR)/include/freetype freetype-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall @@ -96,6 +104,10 @@ freetype-clean: freetype-dirclean: rm -rf $(FREETYPE_DIR) +.PHONY: host-freetype + +host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so + ############################################################# # # Toplevel Makefile options -- cgit v1.2.3