diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-07-17 13:19:54 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-07-17 13:19:54 +0000 |
| commit | a18bc39849c68ac4787eb704097bd2190737bf01 (patch) | |
| tree | c859f0d1c3846c82f997ca9d55993f1720f92ed7 | |
| parent | e80f13d515ecd982f0aa1d6fc51d86c00722cf2c (diff) | |
| download | buildroot-novena-a18bc39849c68ac4787eb704097bd2190737bf01.tar.gz buildroot-novena-a18bc39849c68ac4787eb704097bd2190737bf01.zip | |
zlib: cleanup and fix -clean target
| -rw-r--r-- | package/zlib/zlib.mk | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 2ffe8381a..a9ff342b2 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -36,47 +36,43 @@ $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched ) touch $@ -$(ZLIB_DIR)/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/.configured +$(ZLIB_DIR)/libz.so: $(ZLIB_DIR)/.configured $(MAKE) -C $(ZLIB_DIR) all libz.a - touch -c $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION) + touch -c $@ -$(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION) +$(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/ cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/ cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/ cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/ - ln -sf libz.so.$(ZLIB_VERSION) $(STAGING_DIR)/usr/lib/libz.so.1 - chmod a-x $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) touch -c $@ -$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) +$(TARGET_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.so mkdir -p $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libz.so* + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@ touch -c $@ -$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) +$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/ - rm -f $(TARGET_DIR)/lib/libz.so $(TARGET_DIR)/usr/lib/libz.so - ln -sf libz.so.$(ZLIB_VERSION) $(TARGET_DIR)/usr/lib/libz.so touch -c $@ zlib-headers: $(TARGET_DIR)/usr/lib/libz.a -zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) +zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so zlib-source: $(DL_DIR)/$(ZLIB_SOURCE) zlib-clean: - rm -f $(TARGET_DIR)/usr/lib/libz.so* \ - $(TARGET_DIR)/usr/include/zlib.h \ - $(TARGET_DIR)/usr/include/zconf.h \ - $(STAGING_DIR)/usr/include/zlib.h \ - $(STAGING_DIR)/usr/include/zconf.h \ - $(STAGING_DIR)/usr/lib/libz.* + rm -f $(TARGET_DIR)/usr/lib/libz.* \ + $(TARGET_DIR)/usr/include/zlib.h \ + $(TARGET_DIR)/usr/include/zconf.h \ + $(STAGING_DIR)/usr/include/zlib.h \ + $(STAGING_DIR)/usr/include/zconf.h \ + $(STAGING_DIR)/usr/lib/libz.* -$(MAKE) -C $(ZLIB_DIR) clean zlib-dirclean: |