From ae3175dedfd77b39ddbf76059f2b1242d1ed96bc Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Tue, 19 Jan 2010 23:57:49 +0100
Subject: improve makefile dependencies for depmaker/pkgmaker runs

In a built clone, whenever I change any package/*/Makefile, depmaker and
pkgmaker need to be run again. Before, depmaker wasn't run again as long
as ${TOPDIR}/.config wasn't touched (which is in fact unused by depmaker
and therefore probably a wrong dependency), pkgmaker wasn't run as long
as .menu existed (which now has to be newer than any of the above
Makefiles). While here, this patch also fixes a small whitespace error.
---
 mk/build.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index 758e3a3c4..d9d33d6c1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -10,7 +10,7 @@ endif
 
 CONFIG_CONFIG_IN = Config.in
 CONFIG = config
-DEFCONFIG= 		ADK_DEVELSYSTEM=n \
+DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_DEBUG=n \
 			ADK_STATIC=n \
 			ADK_MAKE_PARALLEL=n \
@@ -105,7 +105,7 @@ all: world
 allcopy: all
 	$(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/
 
-${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config
+${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
 	mksh ${TOPDIR}/package/depmaker
 
 .NOTPARALLEL:
@@ -419,7 +419,7 @@ bulk:
 	    ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
 	done <${TOPDIR}/target/bulk.lst
 
-.menu menu:
+menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
 	mksh $(TOPDIR)/package/pkgmaker
 	@:>.menu
 
-- 
cgit v1.2.3


From ec2537228de9acd23203bd5589a3d78aebc565f9 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Tue, 19 Jan 2010 23:57:50 +0100
Subject: usbutils needs libusb-compat and libpthread

The later dependency is implicitly met at built-time (due to it being
provided by the libc), but still needed at run-time.
---
 package/usbutils/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 43aafc6df..01507694b 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		usbutils
 PKG_VERSION:=		0.73
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libusb
+PKG_BUILDDEP+=		libusb libusb-compat
 PKG_MD5SUM:=		88978b4ad891f610620b1b8e5e0f43eb
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		libusb
+PKG_DEPENDS:=		libusb libusb-compat libpthread
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=linux-usb/}
 
 include ${TOPDIR}/mk/package.mk
-- 
cgit v1.2.3