summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-07-17 13:19:33 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-07-17 13:19:33 +0000
commit160962b1ce43aeb95a0421c5d6f164314b2829f3 (patch)
tree6a9a2c00f430a824c54b7e58303683ea6d3c9d27
parentc40de9fe70b5214f344a3a40c21104cd48afe55f (diff)
tiff: cleanup and fix -clean target
-rw-r--r--package/tiff/tiff.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 633dce7b5..938af2955 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -56,20 +56,22 @@ $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked
$(TIFF_DIR)/libtiff/.libs/libtiff.a: $(TIFF_DIR)/.configured
$(MAKE) -C $(TIFF_DIR)
- touch -c $(TIFF_DIR)/libtiff/.libs/libtiff.a
+ touch -c $@
-$(STAGING_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION): $(TIFF_DIR)/libtiff/.libs/libtiff.a
+$(STAGING_DIR)/usr/lib/libtiff.so: $(TIFF_DIR)/libtiff/.libs/libtiff.a
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(TIFF_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libtiff.la
- touch -c $(STAGING_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
+ touch -c $@
-$(TARGET_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION): $(STAGING_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
+$(TARGET_DIR)/usr/lib/libtiff.so: $(STAGING_DIR)/usr/lib/libtiff.so
cp -dpf $(STAGING_DIR)/usr/lib/libtiff.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-tiff: uclibc zlib jpeg $(TARGET_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
+tiff: uclibc zlib jpeg $(TARGET_DIR)/usr/lib/libtiff.so
tiff-clean:
+ -rm -f $(TARGET_DIR)/usr/lib/libtiff.so*
+ -$(MAKE) -C $(TIFF_DIR) DESTDIR=$(STAGING_DIR) uninstall
-$(MAKE) -C $(TIFF_DIR) clean
tiff-dirclean: