r3097 - trunk/src/host/usbpath

[werner at sita.openmoko.org]

Author: werner
Date: 2007-10-07 09:48:17 +0200 (Sun, 07 Oct 2007)
New Revision: 3097

Added:
   trunk/src/host/usbpath/Makefile.am
   trunk/src/host/usbpath/autogen.sh
   trunk/src/host/usbpath/configure.ac
Removed:
   trunk/src/host/usbpath/Makefile
   trunk/src/host/usbpath/libusbpath.pc.in
Log:
- switched to using autotools.
- figured out how to build dfu-util without libusbpath.pc



Deleted: trunk/src/host/usbpath/Makefile
===================================================================
--- trunk/src/host/usbpath/Makefile	2007-10-07 04:05:52 UTC (rev 3096)
+++ trunk/src/host/usbpath/Makefile	2007-10-07 07:48:17 UTC (rev 3097)
@@ -1,35 +0,0 @@
-CFLAGS=-Wall -g
-LDLIBS=-L. -lusbpath -lusb
-
-PREFIX=/usr/local
-
-
-.PHONY:		all install uninstall clean spotless
-
-all:		usbpath libusbpath.a
-
-usbpath:	libusbpath.a
-
-libusbpath.a:	path2devnum.o devnum2path.o portinfo.o
-		$(AR) crv $@ $^
-
-libusbpath.pc:	libusbpath.pc.in
-		sed 's#PREFIX#$(PREFIX)#' <$^ >$@ || { rm -f $@; exit 1; }
-
-install:	libusbpath.a libusbpath.pc
-		install -m 555 usbpath $(PREFIX)/bin
-		install -m 444 libusbpath.a $(PREFIX)/lib
-		install -m 444 usbpath.h $(PREFIX)/include
-		install -D -m 444 libusbpath.pc $(PREFIX)/lib/pkgconfig
-
-uninstall:
-		rm -f $(PREFIX)/bin/usbpath
-		rm -f $(PREFIX)/lib/libusbpath.a
-		rm -f $(PREFIX)/include/usbpath.h
-		rm -f $(PREFIX)/lib/pkgconfig/libusbpath.pc
-
-clean:
-		rm -f *.o
-
-spotless:	clean
-		rm -f libusbpath.a usbpath libusbpath.pc

Added: trunk/src/host/usbpath/Makefile.am
===================================================================
--- trunk/src/host/usbpath/Makefile.am	2007-10-07 04:05:52 UTC (rev 3096)
+++ trunk/src/host/usbpath/Makefile.am	2007-10-07 07:48:17 UTC (rev 3097)
@@ -0,0 +1,9 @@
+AM_CFLAGS = -Wall
+
+lib_LIBRARIES = libusbpath.a
+bin_PROGRAMS = usbpath
+include_HEADERS = usbpath.h
+
+libusbpath_a_SOURCES = path2devnum.c devnum2path.c portinfo.c usbpath.h
+usbpath_SOURCES = usbpath.c usbpath.h
+usbpath_LDADD = libusbpath.a

Added: trunk/src/host/usbpath/autogen.sh
===================================================================
--- trunk/src/host/usbpath/autogen.sh	2007-10-07 04:05:52 UTC (rev 3096)
+++ trunk/src/host/usbpath/autogen.sh	2007-10-07 07:48:17 UTC (rev 3097)
@@ -0,0 +1,2 @@
+#! /bin/sh
+AUTOMAKE="automake --foreign --add-missing --copy" autoreconf


Property changes on: trunk/src/host/usbpath/autogen.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/src/host/usbpath/configure.ac
===================================================================
--- trunk/src/host/usbpath/configure.ac	2007-10-07 04:05:52 UTC (rev 3096)
+++ trunk/src/host/usbpath/configure.ac	2007-10-07 07:48:17 UTC (rev 3097)
@@ -0,0 +1,13 @@
+AC_INIT([usbpath],[0.1])
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+
+AC_PROG_CC
+AC_PROG_RANLIB
+
+PKG_CHECK_MODULES(USB, libusb,,
+  AC_MSG_ERROR([*** Required libusb not installed ***]))
+
+LIBS="$LIBS $USB_LIBS"
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT

Deleted: trunk/src/host/usbpath/libusbpath.pc.in
===================================================================
--- trunk/src/host/usbpath/libusbpath.pc.in	2007-10-07 04:05:52 UTC (rev 3096)
+++ trunk/src/host/usbpath/libusbpath.pc.in	2007-10-07 07:48:17 UTC (rev 3097)
@@ -1,10 +0,0 @@
-prefix=PREFIX
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libusbpath
-Description: Translation between USB device number and device path
-Version: 0.0.1
-Libs: -L${libdir} -lusb -lusbpath
-Cflags: -I${includedir}