Commit fc0a97a8 authored by Daniel Drake's avatar Daniel Drake

Build system tweaks

Install fprint.h header
Include headers in distribution
distcheck fixes
Include and install pkgconfig file
parent 447b1f01
EXTRA_DIST = THANKS TODO HACKING EXTRA_DIST = THANKS TODO HACKING libfprint.pc.in
SUBDIRS = libfprint SUBDIRS = libfprint
...@@ -6,3 +6,7 @@ if BUILD_EXAMPLES ...@@ -6,3 +6,7 @@ if BUILD_EXAMPLES
SUBDIRS += examples SUBDIRS += examples
endif endif
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=libfprint.pc
DISTCLEANFILES=libfprint.pc
...@@ -3,9 +3,13 @@ LIBRARY ...@@ -3,9 +3,13 @@ LIBRARY
identification identification
external API documentation external API documentation
test suite against NFIQ compliance set test suite against NFIQ compliance set
make library optionally asynchronous and maybe thread-safe
nbis cleanups
track open devices, so we can close them during libfprint close
free memory during libfprint close
DRIVERS NEW DRIVERS
======= ===========
Sunplus 895 driver Sunplus 895 driver
AES1610 driver AES1610 driver
AES2501 driver AES2501 driver
...@@ -20,12 +24,9 @@ aes4000 doesn't work very well, maybe due to small minutia count? ...@@ -20,12 +24,9 @@ aes4000 doesn't work very well, maybe due to small minutia count?
PPMM parameter to get_minutiae seems to have no effect PPMM parameter to get_minutiae seems to have no effect
nbis minutiae should be stored in endian-independent format nbis minutiae should be stored in endian-independent format
return images with standard enroll/verify calls return images with standard enroll/verify calls
upekts reverify problems
MISC MISC
==== ====
upekts/thinkfinger relicensing (GPL --> LGPL) upekts/thinkfinger relicensing (GPL --> LGPL)
make library optionally asynchronous and maybe thread-safe
pkg-config file
nbis cleanups
track open devices, so we can close them during libfprint close
free memory during libfprint close
...@@ -85,6 +85,6 @@ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default vis ...@@ -85,6 +85,6 @@ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default vis
AM_CFLAGS="-Werror-implicit-function-declaration -Wimplicit-int -Wunreachable-code -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wnonnull -Wreturn-type -Wextra -Wshadow" AM_CFLAGS="-Werror-implicit-function-declaration -Wimplicit-int -Wunreachable-code -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wnonnull -Wreturn-type -Wextra -Wshadow"
AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CFLAGS)
AC_CONFIG_FILES([Makefile] [libfprint/Makefile] [examples/Makefile]) AC_CONFIG_FILES([libfprint.pc] [Makefile] [libfprint/Makefile] [examples/Makefile])
AC_OUTPUT AC_OUTPUT
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libfprint
Description: Generic C API for fingerprint reader access
Version: @VERSION@
Libs: -L${libdir} -lfprint
Cflags: -I${includedir}/libfprint
...@@ -7,6 +7,13 @@ AES4000_SRC = drivers/aes4000.c ...@@ -7,6 +7,13 @@ AES4000_SRC = drivers/aes4000.c
DRIVER_SRC = $(UPEKTS_SRC) $(URU4000_SRC) $(AES4000_SRC) DRIVER_SRC = $(UPEKTS_SRC) $(URU4000_SRC) $(AES4000_SRC)
NBIS_SRC = \ NBIS_SRC = \
nbis/include/bozorth.h \
nbis/include/bz_array.h \
nbis/include/defs.h \
nbis/include/lfs.h \
nbis/include/log.h \
nbis/include/morph.h \
nbis/include/sunrast.h \
nbis/bozorth3/bozorth3.c \ nbis/bozorth3/bozorth3.c \
nbis/bozorth3/bz_alloc.c \ nbis/bozorth3/bz_alloc.c \
nbis/bozorth3/bz_drvrs.c \ nbis/bozorth3/bz_drvrs.c \
...@@ -36,11 +43,12 @@ NBIS_SRC = \ ...@@ -36,11 +43,12 @@ NBIS_SRC = \
nbis/mindtct/sort.c \ nbis/mindtct/sort.c \
nbis/mindtct/util.c nbis/mindtct/util.c
libfprint_la_CFLAGS = -fvisibility=hidden -Inbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(AM_CFLAGS) libfprint_la_CFLAGS = -fvisibility=hidden -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(AM_CFLAGS)
libfprint_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ libfprint_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
libfprint_la_LIBADD = -lm $(LIBUSB_LIBS) $(GLIB_LIBS) libfprint_la_LIBADD = -lm $(LIBUSB_LIBS) $(GLIB_LIBS)
libfprint_la_SOURCES = \ libfprint_la_SOURCES = \
fp_internal.h \
core.c \ core.c \
data.c \ data.c \
img.c \ img.c \
...@@ -48,3 +56,4 @@ libfprint_la_SOURCES = \ ...@@ -48,3 +56,4 @@ libfprint_la_SOURCES = \
$(DRIVER_SRC) \ $(DRIVER_SRC) \
$(NBIS_SRC) $(NBIS_SRC)
pkginclude_HEADERS = fprint.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment