summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-04-06 09:21:22 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-04-06 09:21:22 +0000
commit4d298a2d3771c177da606e00b916f58be7c629a0 (patch)
tree0f4346ed7bab77c8d3e21692f72352249544dc61
parentd26240a8cf5bedefc84dd40ba4de73e000fa71b0 (diff)
Makefile: target-devfiles: combine .a / .la find invocation
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b8676bf8a..b360626cd 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)