From 51a6f510786f11c52e90e5a99c82890332ed4d4a Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 12 May 2005 18:03:27 +0000
Subject: [PATCH] remove unnecessary .installed target in fuse and remove some
extra stuff now handled by rules.mk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@834 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
openwrt/package/fuse/Makefile | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile
index c0dd9c160..4e228b3f1 100644
--- a/openwrt/package/fuse/Makefile
+++ b/openwrt/package/fuse/Makefile
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$
$(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
rm -rf config.{cache,status} ; \
touch configure.in ; \
@@ -61,40 +61,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $(PKG_BUILD_DIR)/.configured
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR)
- touch $(PKG_BUILD_DIR)/.built
-
-$(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
install
- touch $(PKG_BUILD_DIR)/.installed
+ touch $(PKG_BUILD_DIR)/.built
-$(IPKG_KMOD_FUSE): $(IDIR_KMOD_FUSE)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_KMOD_FUSE):
mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.o \
$(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
- mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
-$(IPKG_LIBFUSE): $(IDIR_LIBFUSE)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_LIBFUSE):
mkdir -p $(IDIR_LIBFUSE)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
chmod 0644 $(IDIR_LIBFUSE)/usr/lib/lib*.so*
$(RSTRIP) $(IDIR_LIBFUSE)
- mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
-$(IPKG_FUSE_UTILS): $(IDIR_FUSE_UTILS)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_FUSE_UTILS):
mkdir -p $(IDIR_FUSE_UTILS)/usr/bin
cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
$(RSTRIP) $(IDIR_FUSE_UTILS)
- mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.installed
+$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/include
cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse* $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
--
2.20.1