From 5184176c3b7b0749fe1e489386243daad2fd1f28 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Fri, 9 Oct 2009 17:50:05 +0200
Subject: [PATCH] pknock: move into separate directory

There will be a number of pknock-related tools, e.g. the trigger
programs, so move that out to its own directory.
---
 configure.ac                           | 2 +-
 extensions/Kbuild                      | 2 +-
 extensions/Mbuild                      | 2 +-
 extensions/pknock/Kbuild               | 5 +++++
 extensions/pknock/Makefile.am          | 3 +++
 extensions/pknock/Mbuild               | 3 +++
 extensions/{ => pknock}/libxt_pknock.c | 0
 extensions/{ => pknock}/xt_pknock.c    | 0
 extensions/{ => pknock}/xt_pknock.h    | 0
 9 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 extensions/pknock/Kbuild
 create mode 100644 extensions/pknock/Makefile.am
 create mode 100644 extensions/pknock/Mbuild
 rename extensions/{ => pknock}/libxt_pknock.c (100%)
 rename extensions/{ => pknock}/xt_pknock.c (100%)
 rename extensions/{ => pknock}/xt_pknock.h (100%)

diff --git a/configure.ac b/configure.ac
index 4644153..5a97edf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,5 +105,5 @@ AC_SUBST([ksourcedir])
 AC_SUBST([xtlibdir])
 AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
 	extensions/Makefile extensions/ACCOUNT/Makefile
-	extensions/ipset/Makefile])
+	extensions/ipset/Makefile extensions/pknock/Makefile])
 AC_OUTPUT
diff --git a/extensions/Kbuild b/extensions/Kbuild
index b86a1dc..5588c2c 100644
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -26,7 +26,7 @@ obj-${build_ipset}       += ipset/
 obj-${build_ipv4options} += xt_ipv4options.o
 obj-${build_length2}     += xt_length2.o
 obj-${build_lscan}       += xt_lscan.o
-obj-${build_pknock}      += xt_pknock.o
+obj-${build_pknock}      += pknock/
 obj-${build_psd}         += xt_psd.o
 obj-${build_quota2}      += xt_quota2.o
 
diff --git a/extensions/Mbuild b/extensions/Mbuild
index bc0e1d0..533a703 100644
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -21,6 +21,6 @@ obj-${build_ipset}       += ipset/
 obj-${build_ipv4options} += libxt_ipv4options.so
 obj-${build_length2}     += libxt_length2.so
 obj-${build_lscan}       += libxt_lscan.so
-obj-${build_pknock}      += libxt_pknock.so
+obj-${build_pknock}      += pknock/
 obj-${build_psd}         += libxt_psd.so
 obj-${build_quota2}      += libxt_quota2.so
diff --git a/extensions/pknock/Kbuild b/extensions/pknock/Kbuild
new file mode 100644
index 0000000..6318ca5
--- /dev/null
+++ b/extensions/pknock/Kbuild
@@ -0,0 +1,5 @@
+# -*- Makefile -*-
+
+EXTRA_CFLAGS = -I${src}/..
+
+obj-m += xt_pknock.o
diff --git a/extensions/pknock/Makefile.am b/extensions/pknock/Makefile.am
new file mode 100644
index 0000000..af3f625
--- /dev/null
+++ b/extensions/pknock/Makefile.am
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+include ../../Makefile.extra
diff --git a/extensions/pknock/Mbuild b/extensions/pknock/Mbuild
new file mode 100644
index 0000000..7a46751
--- /dev/null
+++ b/extensions/pknock/Mbuild
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+obj-${build_pknock}      += libxt_pknock.so
diff --git a/extensions/libxt_pknock.c b/extensions/pknock/libxt_pknock.c
similarity index 100%
rename from extensions/libxt_pknock.c
rename to extensions/pknock/libxt_pknock.c
diff --git a/extensions/xt_pknock.c b/extensions/pknock/xt_pknock.c
similarity index 100%
rename from extensions/xt_pknock.c
rename to extensions/pknock/xt_pknock.c
diff --git a/extensions/xt_pknock.h b/extensions/pknock/xt_pknock.h
similarity index 100%
rename from extensions/xt_pknock.h
rename to extensions/pknock/xt_pknock.h