Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/zlib
Date: Thu, 17 Jul 2008 06:19:58 -0700 (PDT)	[thread overview]
Message-ID: <20080717131958.58B433C885@busybox.net> (raw)

Author: jacmet
Date: 2008-07-17 06:19:54 -0700 (Thu, 17 Jul 2008)
New Revision: 22860

Log:
zlib: cleanup and fix -clean target

Modified:
   trunk/buildroot/package/zlib/zlib.mk


Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk	2008-07-17 13:19:42 UTC (rev 22859)
+++ trunk/buildroot/package/zlib/zlib.mk	2008-07-17 13:19:54 UTC (rev 22860)
@@ -36,47 +36,43 @@
 	)
 	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:

             reply	other threads:[~2008-07-17 13:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-17 13:19 jacmet at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-12-11 14:40 [Buildroot] svn commit: trunk/buildroot/package/zlib egtvedt at uclibc.org
2008-12-08 14:41 jacmet at uclibc.org
2008-10-31 16:37 correa at uclibc.org
2008-10-31 12:10 correa at uclibc.org
2008-10-31 15:31 ` Thomas Petazzoni
2008-10-31 16:37   ` Thiago A. Corrêa
2007-06-29  8:18 aldot at uclibc.org
2007-06-25  9:07 aldot at uclibc.org
2007-06-25  9:01 aldot at uclibc.org

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080717131958.58B433C885@busybox.net \
    --to=jacmet@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox