sparrowwallet/usb4java
sparrowwallet/usb4java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved build system.

Browse Source
This commit is contained in:
Klaus Reimer 2011-01-27 17:17:31 +01:00 committed by k
parent 132a8cf70a
commit d0bf561e05
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/c/acinclude.m4
View File

@ -6,7 +6,6 @@ AC_DEFUN([AC_CHECK_JAVA],[
JAVA_HOME=`echo $withval`
]
)
CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/win32"
CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/win32"
CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/win32 -I/System/Library/Frameworks/JavaVM.framework/Headers"
AC_CHECK_HEADERS(jni.h,,echo "ERROR: jni.h not found. JAVA_HOME is $JAVA_HOME. Use --with-java-home option to specify an other Java home directory."; exit 1;)
])

3
src/main/c/configure.ac
View File

@ -1,5 +1,5 @@
AC_INIT(configure.ac)
AM_INIT_AUTOMAKE(libusb4java, 1.0.0)
AM_INIT_AUTOMAKE(libusb4java, 0.1.12-1)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])
@ -8,6 +8,7 @@ AC_PROG_CC
AM_PROG_LIBTOOL
AC_CHECK_JAVA
AC_CHECK_HEADERS(usb.h,,echo "ERROR: usb.h not found. Please install libusb"; exit 1;)
AC_SEARCH_LIBS(usb_init,usb usb0,,echo "ERROR: libusb not found. Please install libusb"; exit 1;)
AC_CONFIG_FILES(
Makefile

6
src/main/c/src/Makefile.am
View File

@ -1,7 +1,8 @@
lib_LTLIBRARIES = libusb4java.la
libusb4java_la_CFLAGS = -Wall -Werror -O2 -ansi
libusb4java_la_LIBADD = -lusb
libusb4java_la_LDFLAGS = -version-info 0:0:0 -no-undefined -lusb
libusb4java_la_LIBADD =
libusb4java_la_LDFLAGS = -version-info 0:0:0 -no-undefined
EXTRA_DIST = *.h
libusb4java_la_SOURCES = \
USB.c \
USB_Bus.c \
@ -13,4 +14,3 @@ libusb4java_la_SOURCES = \
USB_Interface_Descriptor.c \
USB_Endpoint_Descriptor.c \
USB_Descriptor_Header.c