Teach our make system how to build libusb for PowerPC

diff --git a/.gitmodules b/.gitmodules
index d44f90f724a6a4b2618183e1b486601e4e8498fc..f3adb2b3d8bfa60f2d15b168a729f09ab88b6899 100644 (file)
--- 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/libusb/Makefile b/build/ppc/libusb/Makefile
new file mode 100644 (file)
index 0000000..08cf5ff
--- /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 (file)
index 0000000..fbdb3ed
--- /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 (symlink)
index 0000000..88cca7f
--- /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 7c09ff2364e2a312eca182d423d85a761a3c84e1..ebb655d2e8a9463755c8abd98a81acb853acb6ec 100755 (executable)
--- 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 (submodule)
index 0000000..ab9cd5a
--- /dev/null
+++ b/src/3rdparty/libusb
@@ -0,0 +1 @@
+Subproject commit ab9cd5a7be637f7b793987971a706b1d11c27ded