CVS: linux-atm/src/switch/tcp Makefile.am,1.3,1.4

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/switch/tcp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18795/src/switch/tcp

Modified Files:
	Makefile.am 
Log Message:
merge 2.5.1 branch into HEAD


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/tcp/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	1 Jan 2008 00:14:52 -0000	1.3
--- Makefile.am	30 Nov 2009 16:56:52 -0000	1.4
***************
*** 1,5 ****
  noinst_PROGRAMS = sw_tcp
  
! INCLUDES = -I$(srcdir)/../../qgen
  
  sw_tcp_SOURCES = tcpsw.c
--- 1,5 ----
  noinst_PROGRAMS = sw_tcp
  
! INCLUDES = -I$(srcdir)/../../q2931
  
  sw_tcp_SOURCES = tcpsw.c