From 2ac8df2b289b6b849b7dab47fc89aa6a260a59a7 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Fri, 9 Dec 2011 16:13:32 +0000 Subject: [PATCH] contrib: move udev and devd files into contrib/ --- Makefile.am | 4 +--- configure.ac | 2 ++ contrib/Makefile.am | 5 ++++- contrib/devd/Makefile.am | 2 ++ pn53x.conf => contrib/devd/pn53x.conf | 0 pn53x.rules => contrib/udev/42-pn53x.rules | 0 contrib/udev/Makefile.am | 2 ++ 7 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 contrib/devd/Makefile.am rename pn53x.conf => contrib/devd/pn53x.conf (100%) rename pn53x.rules => contrib/udev/42-pn53x.rules (100%) create mode 100644 contrib/udev/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0d595db..273cc52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,9 +10,7 @@ pkgconfig_DATA = libnfc.pc EXTRA_DIST = \ CMakeLists.txt \ Doxyfile \ - README-Windows.txt \ - pn53x.conf \ - pn53x.rules + README-Windows.txt CLEANFILES = Doxygen.log coverage.info libnfc.pc diff --git a/configure.ac b/configure.ac index 18ed07c..d2c5a10 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,8 @@ AC_CONFIG_FILES([ cmake/Makefile cmake/modules/Makefile contrib/Makefile + contrib/devd/Makefile + contrib/udev/Makefile contrib/win32/Makefile contrib/win32/sys/Makefile examples/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed130fa..92701a4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = win32 +SUBDIRS = \ + devd \ + udev \ + win32 EXTRA_DIST = \ windows.h diff --git a/contrib/devd/Makefile.am b/contrib/devd/Makefile.am new file mode 100644 index 0000000..c846575 --- /dev/null +++ b/contrib/devd/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ + pn53x.conf diff --git a/pn53x.conf b/contrib/devd/pn53x.conf similarity index 100% rename from pn53x.conf rename to contrib/devd/pn53x.conf diff --git a/pn53x.rules b/contrib/udev/42-pn53x.rules similarity index 100% rename from pn53x.rules rename to contrib/udev/42-pn53x.rules diff --git a/contrib/udev/Makefile.am b/contrib/udev/Makefile.am new file mode 100644 index 0000000..86655ae --- /dev/null +++ b/contrib/udev/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ + 42-pn53x.rules