From 4c0d6e523ec8cdb7feb0480cd27da37f4b03394a Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Tue, 17 Apr 2007 01:03:51 +0000 Subject: - remove overkill recursive Makefile.am definition in examples/ (use EXTRA_DIST) --- Makefile.am | 4 ++-- configure.in | 4 ++-- examples/Makefile.am | 1 - examples/stats/Makefile.am | 1 - examples/sync/Makefile.am | 1 - examples/sync/nack/Makefile.am | 2 -- examples/sync/nack/node1/Makefile.am | 1 - examples/sync/nack/node2/Makefile.am | 1 - examples/sync/persistent/Makefile.am | 2 -- examples/sync/persistent/node1/Makefile.am | 1 - examples/sync/persistent/node2/Makefile.am | 1 - 11 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 examples/Makefile.am delete mode 100644 examples/stats/Makefile.am delete mode 100644 examples/sync/Makefile.am delete mode 100644 examples/sync/nack/Makefile.am delete mode 100644 examples/sync/nack/node1/Makefile.am delete mode 100644 examples/sync/nack/node2/Makefile.am delete mode 100644 examples/sync/persistent/Makefile.am delete mode 100644 examples/sync/persistent/node1/Makefile.am delete mode 100644 examples/sync/persistent/node2/Makefile.am diff --git a/Makefile.am b/Makefile.am index d60c935..6f0e6fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,10 +5,10 @@ include Make_global.am AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 man_MANS = conntrack.8 -EXTRA_DIST = $(man_MANS) Make_global.am ChangeLog TODO +EXTRA_DIST = $(man_MANS) Make_global.am ChangeLog TODO examples SUBDIRS = src extensions -DIST_SUBDIRS = include src extensions examples +DIST_SUBDIRS = include src extensions LINKOPTS = -lnfnetlink -lnetfilter_conntrack -lpthread AM_CFLAGS = -g diff --git a/configure.in b/configure.in index e58bfc4..2982f74 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(conntrackd, 0.9.3, pablo@netfilter.org) +AC_INIT(conntrack-tools, 0.9.3, pablo@netfilter.org) AC_CANONICAL_SYSTEM @@ -103,4 +103,4 @@ dnl debug/src/Makefile dnl extensions/Makefile dnl src/Makefile]) -AC_OUTPUT(Makefile src/Makefile include/Makefile extensions/Makefile examples/Makefile examples/stats/Makefile examples/sync/Makefile examples/sync/persistent/Makefile examples/sync/nack/Makefile examples/sync/persistent/node1/Makefile examples/sync/persistent/node2/Makefile examples/sync/nack/node1/Makefile examples/sync/nack/node2/Makefile) +AC_OUTPUT(Makefile src/Makefile include/Makefile extensions/Makefile) diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index be83d42..0000000 --- a/examples/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = stats sync diff --git a/examples/stats/Makefile.am b/examples/stats/Makefile.am deleted file mode 100644 index b43c3b8..0000000 --- a/examples/stats/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = conntrackd.conf diff --git a/examples/sync/Makefile.am b/examples/sync/Makefile.am deleted file mode 100644 index 28e7643..0000000 --- a/examples/sync/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = persistent nack diff --git a/examples/sync/nack/Makefile.am b/examples/sync/nack/Makefile.am deleted file mode 100644 index 6fd99b1..0000000 --- a/examples/sync/nack/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = script_backup.sh script_master.sh -SUBDIRS = node1 node2 diff --git a/examples/sync/nack/node1/Makefile.am b/examples/sync/nack/node1/Makefile.am deleted file mode 100644 index edc0ed7..0000000 --- a/examples/sync/nack/node1/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = conntrackd.conf keepalived.conf diff --git a/examples/sync/nack/node2/Makefile.am b/examples/sync/nack/node2/Makefile.am deleted file mode 100644 index edc0ed7..0000000 --- a/examples/sync/nack/node2/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = conntrackd.conf keepalived.conf diff --git a/examples/sync/persistent/Makefile.am b/examples/sync/persistent/Makefile.am deleted file mode 100644 index 6fd99b1..0000000 --- a/examples/sync/persistent/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = script_backup.sh script_master.sh -SUBDIRS = node1 node2 diff --git a/examples/sync/persistent/node1/Makefile.am b/examples/sync/persistent/node1/Makefile.am deleted file mode 100644 index edc0ed7..0000000 --- a/examples/sync/persistent/node1/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = conntrackd.conf keepalived.conf diff --git a/examples/sync/persistent/node2/Makefile.am b/examples/sync/persistent/node2/Makefile.am deleted file mode 100644 index edc0ed7..0000000 --- a/examples/sync/persistent/node2/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = conntrackd.conf keepalived.conf -- cgit v1.2.3