From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Apr 2009 09:21:22 +0000 (-0000)
Subject: Makefile: target-devfiles: combine .a / .la find invocation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d298a2d3771c177da606e00b916f58be7c629a0;p=buildroot.git

Makefile: target-devfiles: combine .a / .la find invocation
---

diff --git a/Makefile b/Makefile
index b8676bf8a6..b360626cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -331,7 +331,7 @@ $(PROJECT_BUILD_DIR)/.root:
 		touch $(STAGING_DIR)/.fakeroot.00000; \
 	fi
 	-find $(TARGET_DIR) -type d -name CVS -o -name .svn | xargs rm -rf
-	-find $(TARGET_DIR) -type f -name .empty | xargs rm -rf	
+	-find $(TARGET_DIR) -type f -name .empty | xargs rm -rf
 	touch $@
 
 $(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root
@@ -344,10 +344,8 @@ ifeq ($(BR2_HAVE_DEVFILES),y)
 	( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
 else
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig
-	find $(TARGET_DIR)/usr/lib -name '*.a' -delete
-	find $(TARGET_DIR)/lib -name '*.a' -delete
-	find $(TARGET_DIR)/usr/lib -name '*.la' -delete
-	find $(TARGET_DIR)/lib -name '*.la' -delete
+	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -delete
+	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -delete
 endif
 
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)