From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 29 Sep 2012 19:15:45 +0000 (+0200)
Subject: Merge branch 'libusb'
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/545333dc965ac10b96e67c8d7cbb9aa148a8fb6e?hp=8178f7ff497641083882503825cf0357300f85ac

Merge branch 'libusb'
---

diff --git a/.gitmodules b/.gitmodules
index d44f90f7..f3adb2b3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "bin/gumstix"]
 	path = bin/gumstix
 	url = ssh://git@rtime.felk.cvut.cz/eurobot/gumstix-bin
+[submodule "src/3rdparty/libusb"]
+	path = src/3rdparty/libusb
+	url = git://git.libusb.org/libusb.git
diff --git a/build/ppc/config.target b/build/ppc/config.target
index 7905118f..55ff7851 100644
--- a/build/ppc/config.target
+++ b/build/ppc/config.target
@@ -4,6 +4,7 @@ CXX = $(CROSS_COMPILE)g++
 AS = $(CROSS_COMPILE)as
 AR = $(CROSS_COMPILE)ar
 
+export PKG_CONFIG_PATH=$(OUTPUT_DIR)/_compiled/lib/pkgconfig
 
 #CONFIG_OC_ETH_ORTE_IDL=y
 
diff --git a/build/ppc/libusb/Makefile b/build/ppc/libusb/Makefile
new file mode 100644
index 00000000..08cf5ff3
--- /dev/null
+++ b/build/ppc/libusb/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+	@echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else	
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+
diff --git a/build/ppc/libusb/Makefile.omk b/build/ppc/libusb/Makefile.omk
new file mode 100644
index 00000000..fbdb3edf
--- /dev/null
+++ b/build/ppc/libusb/Makefile.omk
@@ -0,0 +1,18 @@
+include-pass_HOOKS = install-libusb
+
+export CC
+export CFLAGS
+
+PREFIX=$(OUTPUT_DIR)/_compiled
+
+install-libusb: $(PREFIX)/lib/pkgconfig/libusb-1.0.pc
+
+config.status:
+	unset CONFIG_FILES; \
+	$(srcdir)/src/configure --host=powerpc-linux-gnu --prefix=$(PREFIX)
+
+libusb-1.0.pc: config.status
+	$(MAKE)
+
+$(PREFIX)/lib/pkgconfig/libusb-1.0.pc: libusb-1.0.pc
+	$(MAKE) install
diff --git a/build/ppc/libusb/src b/build/ppc/libusb/src
new file mode 120000
index 00000000..88cca7fe
--- /dev/null
+++ b/build/ppc/libusb/src
@@ -0,0 +1 @@
+../../../src/3rdparty/libusb
\ No newline at end of file
diff --git a/build/prepare_infrastructure b/build/prepare_infrastructure
index 7c09ff23..ebb655d2 100755
--- a/build/prepare_infrastructure
+++ b/build/prepare_infrastructure
@@ -29,6 +29,7 @@ update_submodule src/ulut
 update_submodule robot-root
 update_submodule src/v4l/v4l-utils
 update_submodule src/pxmc
+update_submodule src/3rdparty/libusb && ( cd src/3rdparty/libusb && ./autogen.sh && make distclean )
 #update_submodule src/linux-shark
 
 
@@ -40,4 +41,3 @@ for i in h8eurobot/ h8mirosot/ h8canusb/ host/ ppc/ lpceurobot/; do
 	echo "make default-config"
 	make -C $i default-config | grep -v default-config-pass
 done
-
diff --git a/src/3rdparty/libusb b/src/3rdparty/libusb
new file mode 160000
index 00000000..ab9cd5a7
--- /dev/null
+++ b/src/3rdparty/libusb
@@ -0,0 +1 @@
+Subproject commit ab9cd5a7be637f7b793987971a706b1d11c27ded