From 464536122586dcc962b5d6441cb397f69caee2cd Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Fri, 21 Jan 2011 23:52:57 +0100
Subject: [PATCH] Fixed C build.

---
 .hgignore                           |  6 ++++++
 usb4java-lib/Makefile.scm           | 15 ++++++++-------
 usb4java-lib/configure.ac           |  4 +++-
 usb4java-lib/src/Makefile.am        |  1 +
 usb4java-lib/src/main/Makefile.am   |  1 +
 usb4java-lib/src/main/c/Makefile.am | 10 +++++-----
 6 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 usb4java-lib/src/Makefile.am
 create mode 100644 usb4java-lib/src/main/Makefile.am

diff --git a/.hgignore b/.hgignore
index e7e54fb..a493b7f 100644
--- a/.hgignore
+++ b/.hgignore
@@ -24,7 +24,13 @@ Debug
 autom4te.cache
 dump
 ltmain.sh
+.libs
+*.lo
+*.o
+*.la
 
 syntax: regexp
 ^usb4java-lib/src/main/c/Makefile$
+^usb4java-lib/src/main/Makefile$
+^usb4java-lib/src/Makefile$
 ^usb4java-lib/Makefile$
diff --git a/usb4java-lib/Makefile.scm b/usb4java-lib/Makefile.scm
index 3789c08..324f816 100644
--- a/usb4java-lib/Makefile.scm
+++ b/usb4java-lib/Makefile.scm
@@ -4,6 +4,7 @@ all:
 	
 clean:
 	rm -rf \
+	  Debug \
 	  autom4te.cache \
 	  m4 \
 	  aclocal.m4 \
@@ -23,13 +24,13 @@ clean:
 	  Makefile.in \
 	  missing \
 	  stamp-h1 \
-	  src/Makefile.in \
-	  src/.deps \
-	  src/.libs \
-	  src/*.lo \
-	  src/*.la \
-	  src/*.o \
-	  src/Makefile \
+	  src/main/c/Makefile.in \
+	  src/main/c/.deps \
+	  src/main/c/.libs \
+	  src/main/c/*.lo \
+	  src/main/c/*.la \
+	  src/main/c/*.o \
+	  src/main/c/Makefile \
 	  *.tar.gz \
 	  *.tar.bz2 \
           *~
diff --git a/usb4java-lib/configure.ac b/usb4java-lib/configure.ac
index 9280385..e8b3bac 100644
--- a/usb4java-lib/configure.ac
+++ b/usb4java-lib/configure.ac
@@ -11,6 +11,8 @@ AC_CHECK_HEADERS(usb.h,,echo "ERROR: usb.h not found. Please install libusb"; ex
 
 AC_CONFIG_FILES(
   Makefile 
-  src/Makefile
+  src/Makefile  
+  src/main/Makefile
+  src/main/c/Makefile
 )
 AC_OUTPUT
diff --git a/usb4java-lib/src/Makefile.am b/usb4java-lib/src/Makefile.am
new file mode 100644
index 0000000..4840ad7
--- /dev/null
+++ b/usb4java-lib/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = main
diff --git a/usb4java-lib/src/main/Makefile.am b/usb4java-lib/src/main/Makefile.am
new file mode 100644
index 0000000..6f20b92
--- /dev/null
+++ b/usb4java-lib/src/main/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = c
diff --git a/usb4java-lib/src/main/c/Makefile.am b/usb4java-lib/src/main/c/Makefile.am
index 52dfd4b..e132461 100644
--- a/usb4java-lib/src/main/c/Makefile.am
+++ b/usb4java-lib/src/main/c/Makefile.am
@@ -4,9 +4,9 @@ libusb4java_la_LIBADD = -lusb
 libusb4java_la_LDFLAGS = -version-info 1:0:0 -no-undefined -lusb
 libusb4java_la_SOURCES = \
     USB.c \
-    USBBus.c \
-    USBDevice.c \
-    USBDeviceDescriptor.c \
-    USBConfigDescriptor.c \
-    USBDevHandle.c
+    USB_Bus.c \
+    USB_Device.c \
+    USB_Device_Descriptor.c \
+    USB_Config_Descriptor.c \
+    USB_Handle.c
 	
\ No newline at end of file