minor tweaks, mostly to clean out *~

baigubulu · Oct 19, 2004 · 1550cd6 · 1550cd6
1 parent 3962024
commit 1550cd6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,17 +1,13 @@
 AUTOMAKE_OPTIONS = foreign
 
-DIST_SUBDIRS = lib src docs
+SUBDIRS = lib src man docs
+DIST_SUBDIRS = scripts lib src man docs
 
-SUBDIRS = lib src
-
-docdir = $(top_builddir)/docs
-
-docs:
-	echo Making documentation in $(docdir)
-	cd $(docdir) && make all
 
 testdir = $(top_buildir)/test
 
 test:
 	echo Making $ in $(testdir)
 	cd $(testdir) && make $
+
+MOSTLYCLEANFILES = tcpreplay.spec *~
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LIBRARIES = libstrl.a
 
-libstrl_a_SOURCES = strlcat.c strlcpy.c 
+libstrl_a_SOURCES = strlcat.c strlcpy.c
 
 noinst_HEADERS = strlcpy.h tree.h queue.h sll.h
+
+MOSTLYCLEANFILES = *~ *.o *.a
diff --git a/man/Makefile.am b/man/Makefile.am
@@ -1 +1,3 @@
 man_MANS = tcpreplay.8 tcpprep.1 flowreplay.1
+
+MOSTLYCLEANFILES = *~
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -0,0 +1,3 @@
+#nothing to do here
+EXTRA_DIST = dlt2name.pl
+MOSTLYCLEANFILES = *~
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -13,8 +13,10 @@ flowreplay_SOURCES = flowreplay.c flowkey.c flownode.c flowbuff.c flowstate.c
 
 tcpreplay_LDADD = ./common/libcommon.a ../lib/libstrl.a \
 		  @LNAVLIB@ @LNETLIB@ @LPCAPLIB@
-tcpprep_LDADD = ./common/libcommon.a ../lib/libstrl.a \
-		@LNETLIB@ @LPCAPLIB@
+
+tcpprep_LDADD =  ./common/libcommon.a ../lib/libstrl.a \
+		  @LNETLIB@ @LPCAPLIB@
+
 flowreplay_LDADD = ./common/libcommon.a ../lib/libstrl.a \
 		   @LNETLIB@ @LPCAPLIB@
 
@@ -26,3 +28,5 @@ noinst_HEADERS = tcpreplay.h tcpprep.h flowreplay.h netout.h \
 tcpreplay_CFLAGS = -I../lib
 tcpprep_CFLAGS = -I../lib
 flowreplay_CFLAGS = -I../lib
+
+MOSTLYCLEANFILES = *~ *.o
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -11,3 +11,5 @@ libcommon_a_LIBADD = ../../lib/libstrl.a
 noinst_HEADERS = cidr.h err.h list.h cache.h services.h \
 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
 		 confargs.h confargs.c tree.h timer.h
+
+MOSTLYCLEANFILES = *~
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		man_MANS = tcpreplay.8 tcpprep.1 flowreplay.1

		MOSTLYCLEANFILES = *~