From 8c3caed99f38303e6f4c5778af9b8179e90a1373 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Thu, 3 Feb 2011 09:51:38 +0000 Subject: [PATCH] Add missing CMake files to generated tarball. (Thanks to Glenn) --- Makefile.am | 2 +- cmake_modules/Makefile.am | 7 ++++++- configure.ac | 2 ++ contrib/Makefile.am | 4 ++++ contrib/win32/Makefile.am | 2 ++ 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 contrib/Makefile.am create mode 100644 contrib/win32/Makefile.am diff --git a/Makefile.am b/Makefile.am index 6cf0ff2..cea72e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = $(LIBNFC_CFLAGS) -SUBDIRS = libnfc examples include cmake_modules test +SUBDIRS = libnfc examples include contrib cmake_modules test pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnfc.pc diff --git a/cmake_modules/Makefile.am b/cmake_modules/Makefile.am index 40699e3..52fd92d 100644 --- a/cmake_modules/Makefile.am +++ b/cmake_modules/Makefile.am @@ -1 +1,6 @@ -EXTRA_DIST = COPYING-CMAKE-SCRIPTS FindLIBUSB.cmake FindPCSC.cmake UseDoxygen.cmake +EXTRA_DIST = \ + COPYING-CMAKE-SCRIPTS \ + FindLIBUSB.cmake \ + FindPCSC.cmake \ + UseDoxygen.cmake \ + LibnfcDrivers.cmake diff --git a/configure.ac b/configure.ac index 23e5b6e..6c8b950 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,8 @@ CFLAGS="$CFLAGS -Du_int8_t=uint8_t -Du_int16_t=uint16_t" AC_CONFIG_FILES([ Doxyfile Makefile + contrib/Makefile + contrib/win32/Makefile cmake_modules/Makefile examples/Makefile examples/pn53x-tamashell-scripts/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..ed130fa --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = win32 + +EXTRA_DIST = \ + windows.h diff --git a/contrib/win32/Makefile.am b/contrib/win32/Makefile.am new file mode 100644 index 0000000..bc22ff8 --- /dev/null +++ b/contrib/win32/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ + err.h