[netfilter-cvslog] r6798 - in trunk/conntrack-tools: . examples examples/stats examples/sync examples/sync/nack examples/sync/nack/node1 examples/sync/nack/node2 examples/sync/persistent examples/sync/persistent/node1 examples/sync/persistent/node2

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-04-17 03:03:51 +0200 (Tue, 17 Apr 2007)
New Revision: 6798

Removed:
   trunk/conntrack-tools/examples/Makefile.am
   trunk/conntrack-tools/examples/stats/Makefile.am
   trunk/conntrack-tools/examples/sync/Makefile.am
   trunk/conntrack-tools/examples/sync/nack/Makefile.am
   trunk/conntrack-tools/examples/sync/nack/node1/Makefile.am
   trunk/conntrack-tools/examples/sync/nack/node2/Makefile.am
   trunk/conntrack-tools/examples/sync/persistent/Makefile.am
   trunk/conntrack-tools/examples/sync/persistent/node1/Makefile.am
   trunk/conntrack-tools/examples/sync/persistent/node2/Makefile.am
Modified:
   trunk/conntrack-tools/Makefile.am
   trunk/conntrack-tools/configure.in
Log:
- remove overkill recursive Makefile.am definition in examples/ (use EXTRA_DIST)



Modified: trunk/conntrack-tools/Makefile.am
===================================================================
--- trunk/conntrack-tools/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -5,10 +5,10 @@
 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
 

Modified: trunk/conntrack-tools/configure.in
===================================================================
--- trunk/conntrack-tools/configure.in	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/configure.in	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1,4 +1,4 @@
-AC_INIT(conntrackd, 0.9.3, pablo at netfilter.org)
+AC_INIT(conntrack-tools, 0.9.3, pablo at netfilter.org)
 
 AC_CANONICAL_SYSTEM
 
@@ -103,4 +103,4 @@
 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)

Deleted: trunk/conntrack-tools/examples/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-SUBDIRS = stats sync 

Deleted: trunk/conntrack-tools/examples/stats/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/stats/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/stats/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-EXTRA_DIST = conntrackd.conf 

Deleted: trunk/conntrack-tools/examples/sync/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-SUBDIRS = persistent nack

Deleted: trunk/conntrack-tools/examples/sync/nack/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/nack/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/nack/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1,2 +0,0 @@
-EXTRA_DIST = script_backup.sh script_master.sh 
-SUBDIRS = node1 node2

Deleted: trunk/conntrack-tools/examples/sync/nack/node1/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/nack/node1/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/nack/node1/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-EXTRA_DIST = conntrackd.conf keepalived.conf 

Deleted: trunk/conntrack-tools/examples/sync/nack/node2/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/nack/node2/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/nack/node2/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-EXTRA_DIST = conntrackd.conf keepalived.conf 

Deleted: trunk/conntrack-tools/examples/sync/persistent/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/persistent/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/persistent/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1,2 +0,0 @@
-EXTRA_DIST = script_backup.sh script_master.sh 
-SUBDIRS = node1 node2

Deleted: trunk/conntrack-tools/examples/sync/persistent/node1/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/persistent/node1/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/persistent/node1/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-EXTRA_DIST = conntrackd.conf keepalived.conf 

Deleted: trunk/conntrack-tools/examples/sync/persistent/node2/Makefile.am
===================================================================
--- trunk/conntrack-tools/examples/sync/persistent/node2/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
+++ trunk/conntrack-tools/examples/sync/persistent/node2/Makefile.am	2007-04-17 01:03:51 UTC (rev 6798)
@@ -1 +0,0 @@
-EXTRA_DIST = conntrackd.conf keepalived.conf