From cebadbfcd7971d4a404cb27d4d86d66c12c52a65 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Aug 2009 20:12:43 +0200 Subject: [PATCH] psd: merge into main configuration files When psd is included in the main tree, it can use the main configuration files. --- extensions/Kbuild | 1 + extensions/Kbuild.psd | 1 - extensions/Mbuild | 1 + extensions/Mbuild.psd | 1 - mconfig | 1 + mconfig.psd | 2 -- 6 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 extensions/Kbuild.psd delete mode 100644 extensions/Mbuild.psd delete mode 100644 mconfig.psd diff --git a/extensions/Kbuild b/extensions/Kbuild index 64c7d35..4b8dcb2 100644 --- 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 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 0a24854..c6baa17 100644 --- 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 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 47761a8..6337155 100644 --- 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 index a01f5ea..0000000 --- a/mconfig.psd +++ /dev/null @@ -1,2 +0,0 @@ -# -*- Makefile -*- -build_psd=m