CVS: linux-atm/src/maint Makefile.am,1.3,1.4 hediag.c,1.3,1.4

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

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

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


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/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:51 -0000	1.3
--- Makefile.am	30 Nov 2009 16:56:52 -0000	1.4
***************
*** 3,7 ****
  USRPGMS=atmdiag atmdump sonetdiag saaldump
  
! INCLUDES=-I$(srcdir)/../qgen -I$(srcdir)/../saal -I.
  LDADD = $(top_builddir)/src/lib/libatm.la
  
--- 3,7 ----
  USRPGMS=atmdiag atmdump sonetdiag saaldump
  
! INCLUDES=-I$(srcdir)/../q2931 -I$(srcdir)/../saal -I.
  LDADD = $(top_builddir)/src/lib/libatm.la
  
***************
*** 22,26 ****
  sonetdiag_SOURCES = sonetdiag.c
  saaldump_SOURCES = saaldump.c
! saaldump_LDADD = $(top_builddir)/src/qgen/qd.dump.o $(top_builddir)/src/saal/libsaal.a $(LDADD)
  saaldump_DEPENDENCIES = $(saaldump_LDADD)
  
--- 22,26 ----
  sonetdiag_SOURCES = sonetdiag.c
  saaldump_SOURCES = saaldump.c
! saaldump_LDADD = $(top_builddir)/src/q2931/qd.dump.o $(top_builddir)/src/saal/libsaal.a $(LDADD)
  saaldump_DEPENDENCIES = $(saaldump_LDADD)
  

Index: hediag.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/hediag.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hediag.c	3 Mar 2009 18:23:26 -0000	1.3
--- hediag.c	30 Nov 2009 16:56:52 -0000	1.4
***************
*** 1,5 ****
  #include <stdio.h>
  #include <stdlib.h>
! #include <string.h>
  #include <sys/ioctl.h>
  #include <sys/types.h>
--- 1,5 ----
  #include <stdio.h>
  #include <stdlib.h>
! #include <unistd.h>
  #include <sys/ioctl.h>
  #include <sys/types.h>