psd: merge into main configuration files

When psd is included in the main tree, it can use the main
configuration files.

diff --git a/extensions/Kbuild b/extensions/Kbuild
index 64c7d351140a53d55d43381982de8746b59e8a91..4b8dcb2ee723e67dfc931bf1e6390c9984d10ed7 100644 (file)
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -25,6 +25,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_psd}         += xt_psd.o
 obj-${build_quota2}      += xt_quota2.o
 
 -include ${M}/*.Kbuild

diff --git a/extensions/Kbuild.psd b/extensions/Kbuild.psd
deleted file mode 100644 (file)
index 9fd0305..0000000
--- a/extensions/Kbuild.psd
+++ /dev/null
@@ -1 +0,0 @@
-obj-${build_psd}                += xt_psd.o

diff --git a/extensions/Mbuild b/extensions/Mbuild
index 0a24854118bd6714e6d547c010188870b122f504..c6baa176db7345892707021da3c230526dfc72a8 100644 (file)
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -18,4 +18,5 @@ obj-${build_ipset}       += ipset/
 obj-${build_ipv4options} += libxt_ipv4options.so
 obj-${build_length2}     += libxt_length2.so
 obj-${build_lscan}       += libxt_lscan.so
+obj-${build_psd}         += libxt_psd.so
 obj-${build_quota2}      += libxt_quota2.so

diff --git a/extensions/Mbuild.psd b/extensions/Mbuild.psd
deleted file mode 100644 (file)
index 5a1ae3b..0000000
--- a/extensions/Mbuild.psd
+++ /dev/null
@@ -1 +0,0 @@
-obj-${build_psd}            += libxt_psd.so

diff --git a/mconfig b/mconfig
index 47761a8c9b960a761b10aab057369b9c1a6f1a1c..6337155ff8b843ac0cf9b74ffbeabf93215ebe4a 100644 (file)
--- a/mconfig
+++ b/mconfig
@@ -20,4 +20,5 @@ build_ipset=m
 build_ipv4options=m
 build_length2=m
 build_lscan=m
+build_psd=m
 build_quota2=m

diff --git a/mconfig.psd b/mconfig.psd
deleted file mode 100644 (file)
index a01f5ea..0000000
--- a/mconfig.psd
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- Makefile -*-
-build_psd=m