From 7314b7d5982a1d0ba0f138c03d6f647b367d5bf7 Mon Sep 17 00:00:00 2001 From: Romain Tartiere Date: Sat, 2 Apr 2011 21:16:31 +0000 Subject: [PATCH] Unbreak build. Reported by: yobibe Pointy hat to: rconty --- Makefile.am | 3 +-- cmake/Makefile.am | 5 +++++ configure.ac | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 cmake/Makefile.am diff --git a/Makefile.am b/Makefile.am index 34a9c83..c606fc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = $(LIBNFC_CFLAGS) -SUBDIRS = libnfc examples include contrib cmake_modules test +SUBDIRS = libnfc examples include contrib cmake test pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnfc.pc @@ -12,7 +12,6 @@ EXTRA_DIST = \ Doxyfile \ LICENSE \ README-Windows.txt \ - config.h.cmake \ pn53x.conf \ pn53x.rules diff --git a/cmake/Makefile.am b/cmake/Makefile.am new file mode 100644 index 0000000..d644873 --- /dev/null +++ b/cmake/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = modules + +EXTRA_DIST = \ + config_posix.h.cmake \ + config_windows.h.cmake diff --git a/configure.ac b/configure.ac index ab0fa19..72bb74d 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,9 @@ AC_CONFIG_FILES([ Makefile contrib/Makefile contrib/win32/Makefile - cmake_modules/Makefile + contrib/win32/sys/Makefile + cmake/Makefile + cmake/modules/Makefile examples/Makefile examples/pn53x-tamashell-scripts/Makefile include/Makefile