Browse Source

Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

waldemar brodkorb 14 years ago
parent
commit
a154a4cae1
2 changed files with 5 additions and 5 deletions
  1. 3 3
      mk/build.mk
  2. 2 2
      package/usbutils/Makefile

+ 3 - 3
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
 

+ 2 - 2
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