Include common/netmap.h in Makefile.am - closes appneta#108

baigubulu · Jul 28, 2014 · f91e4b7 · f91e4b7
1 parent 811230f
commit f91e4b7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/configure b/configure
@@ -2961,7 +2961,7 @@ MAINTAINER_AUTOGEN_VERSION=5.16.2
 
 MAJOR_VERSION=4
 MINOR_VERSION=0
-MICRO_VERSION=5-beta1
+MICRO_VERSION=5-beta2
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 PACKAGE_URL=http://tcpreplay.appneta.com/
 

diff --git a/configure.ac b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl Set version info here!
 MAJOR_VERSION=4
 MINOR_VERSION=0
-MICRO_VERSION=5-beta1
+MICRO_VERSION=5-beta2
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 PACKAGE_URL=http://tcpreplay.appneta.com/
 

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,3 +1,6 @@
+06/28/2014 Version 4.0.5beta2
+    - Add missing header to distribution (#108)
+
 06/21/2014 Version 4.0.5beta1
     - Make --netmap version agnostic (#106)
     - Fix netmap hang in FreeBSD 11 (#103)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -34,7 +34,8 @@ endif
 noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
 		 tcpdump.h timer.h pcap_dlt.h sendpacket.h \
-		 dlt_names.h mac.h interface.h flows.h txring.h
+		 dlt_names.h mac.h interface.h flows.h txring.h \
+		 netmap.h
 
 MOSTLYCLEANFILES = *~
 

diff --git a/src/common/Makefile.in b/src/common/Makefile.in
@@ -251,7 +251,8 @@ AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS) @LDNETINC@
 noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
 		 tcpdump.h timer.h pcap_dlt.h sendpacket.h \
-		 dlt_names.h mac.h interface.h flows.h txring.h
+		 dlt_names.h mac.h interface.h flows.h txring.h \
+		 netmap.h
 
 MOSTLYCLEANFILES = *~
 MAINTAINERCLEANFILES = Makefile.in git_version.c