Fixed C build.

.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$

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 \
           *~

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

usb4java-lib/src/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = main

usb4java-lib/src/main/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = c

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