diff options
| author | waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> | 2010-01-20 19:32:43 +0100 |
|---|---|---|
| committer | waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> | 2010-01-20 19:32:43 +0100 |
| commit | a154a4cae1b78e68f4421142e7f2e77c85db4754 (patch) | |
| tree | 46f57c26b15902ef3d7fed926d0c5fbd525dd113 | |
| parent | dd181acc1ac0c1e7dc9db85da30bd8522a95773d (diff) | |
| parent | ec2537228de9acd23203bd5589a3d78aebc565f9 (diff) | |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | package/usbutils/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 798b0a762..66f49089b 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 \ @@ -110,7 +110,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: @@ -424,7 +424,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 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 |