diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-07-29 07:14:01 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-07-29 07:14:01 +0000 |
| commit | 01be4a3b105784f1cb0542af938cbc8384b81f94 (patch) | |
| tree | fc1e67b7499adf4376194b79ef5a48e7c4011a94 | |
| parent | d9da157de9e1b2c56c76c1962abf51f13905d36b (diff) | |
Cleanup of libpng
| -rw-r--r-- | package/libpng/libpng.mk | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 57610aac5..4e76db020 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -35,7 +35,7 @@ libpng-source: $(DL_DIR)/$(LIBPNG_SOURCE) $(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE) $(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(CONFIG_UPDATE) $(LIBPNG_DIR) - touch $(LIBPNG_DIR)/.unpacked + touch $@ $(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked (cd $(LIBPNG_DIR); rm -rf config.cache; \ @@ -51,35 +51,26 @@ $(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ --sysconfdir=/etc \ - --datadir=/usr/share \ --localstatedir=/var \ - --includedir=/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ --without-libpng-compat \ --without-x \ ); - touch $(LIBPNG_DIR)/.configured + touch $@ $(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured $(MAKE) -C $(LIBPNG_DIR) - touch $(LIBPNG_DIR)/.compiled + touch $@ $(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install; - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libpng12.la - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \ + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la + $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include/libpng12\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \ + -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng12\',g" \ + -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ $(STAGING_DIR)/usr/bin/libpng12-config - touch -c $(STAGING_DIR)/lib/libpng.so + touch -c $@ $(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so cp -dpf $(STAGING_DIR)/lib/libpng*.so* $(TARGET_DIR)/usr/lib/ |