[Guessnet-devel] [svn] r109 - in trunk: . scripts src tests

[Enrico Zini]

Author: enrico
Date: Mon Apr 11 15:40:08 2005
New Revision: 109

Modified:
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/scripts/Makefile.am
   trunk/src/Makefile.am
   trunk/tests/Makefile.am
Log:
Fixed the EXTRA_DIST in makefile.am: now we can do a normal release :)

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Apr 11 15:40:08 2005
@@ -7,4 +7,4 @@
 guessnet-ifupdown.8: guessnet.8
 	ln -s guessnet.8 guessnet-ifupdown.8
 
-EXTRA_DISTS=$(man_MANS)
+EXTRA_DIST=$(man_MANS) autogen.sh testnets

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Mon Apr 11 15:40:08 2005
@@ -2,10 +2,21 @@
 
 # Rebuild the build system
 
-aclocal-1.8
-#test -d /usr/local/share/aclocal && aclocal -I /usr/local/share/aclocal
+ACLOCAL=aclocal
+AUTOMAKE=automake
+
+for i in 1.9 1.8 1.7
+do
+	if which $ACLOCAL-$i > /dev/null
+	then
+		ACLOCAL=aclocal-$i
+		AUTOMAKE=automake-$i
+		break
+	fi
+done
+
+$ACLOCAL
 autoheader
-#libtoolize --force -c
-automake-1.8 -a -f -c --foreign
+libtoolize --force -c
+$AUTOMAKE --foreign -a -f -c
 autoconf
-

Modified: trunk/scripts/Makefile.am
==============================================================================
--- trunk/scripts/Makefile.am	(original)
+++ trunk/scripts/Makefile.am	Mon Apr 11 15:40:08 2005
@@ -1 +1,3 @@
 script_SCRIPTS = test-wireless test-wireless-scan test-wireless-ap
+
+EXTRA_DIST = test-wireless test-wireless-scan test-wireless-ap

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Apr 11 15:40:08 2005
@@ -60,3 +60,38 @@
 
 INCLUDES=@LIBNET_CFLAGS@ -DSCRIPTDIR=\"@scriptdir@\"
 
+EXTRA_DIST = \
+	Buffer.h \
+	ChildProcess.h \
+	CommandlineParser.h \
+	DHCPScanner.h \
+	Environment.h \
+	ethtool-kernel.h \
+	ethtool-local.h \
+	Exception.h \
+	Exec.h \
+	GuessnetEnvironment.h \
+	GuessnetParser.h \
+	IFace.h \
+	IfaceParser.h \
+	Mutex.h \
+	NetBuffer.h \
+	NetSender.h \
+	nettypes.h \
+	NetWatcher.h \
+	PacketMaker.h \
+	Parser.h \
+	PeerScanner.h \
+	ProcessRunner.h \
+	Regexp.h \
+	ScanBag.h \
+	ScanConsumer.h \
+	Scanner.h \
+	Scans.h \
+	ScriptScanner.h \
+	stringf.h \
+	Thread.h \
+	TrafficScanner.h \
+	wireless.15.h \
+	wireless.16.h \
+	wireless.h

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Mon Apr 11 15:40:08 2005
@@ -66,3 +66,5 @@
 	../src/Parser.o
 
 INCLUDES=@LIBNET_CFLAGS@ -DSCRIPTDIR=\"@scriptdir@\" -I ../src
+
+EXTRA_DIST = test-guessnet test-ifupdown