CVS: linux-atm/src/sigd Makefile.am,1.3,1.4 sap.c,1.3,1.4

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

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

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


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/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,3 ****
! INCLUDES = -I$(top_builddir)/src/qgen -I$(srcdir)/../qgen -I$(srcdir)/../saal -I.
  
  sbin_PROGRAMS = atmsigd
--- 1,3 ----
! INCLUDES = -I$(top_builddir)/src/q2931 -I$(srcdir)/../q2931 -I$(srcdir)/../saal -I.
  
  sbin_PROGRAMS = atmsigd
***************
*** 5,10 ****
  			sap.c sap.h timeout.c timeout.h trace.c trace.h \
  			policy.c policy.h cfg_y.y cfg_l.l
! atmsigd_XTRAS = mess.o $(top_builddir)/src/qgen/q.out.o \
! 			$(top_builddir)/src/qgen/qd.dump.o \
  			$(top_builddir)/src/lib/libatm.la \
  			$(top_builddir)/src/saal/libsaal.a
--- 5,10 ----
  			sap.c sap.h timeout.c timeout.h trace.c trace.h \
  			policy.c policy.h cfg_y.y cfg_l.l
! atmsigd_XTRAS = mess.o $(top_builddir)/src/q2931/q.out.o \
! 			$(top_builddir)/src/q2931/qd.dump.o \
  			$(top_builddir)/src/lib/libatm.la \
  			$(top_builddir)/src/saal/libsaal.a
***************
*** 19,23 ****
  EXTRA_DIST = cfg_y.h $(man_MANS) $(sysconf_DATA) mkmess.pl README
  
! mess.c:	$(top_builddir)/src/qgen/uni.h mkmess.pl
! 	@PERL@ $(srcdir)/mkmess.pl <$(srcdir)/../qgen/uni.h >mess.c
  
--- 19,23 ----
  EXTRA_DIST = cfg_y.h $(man_MANS) $(sysconf_DATA) mkmess.pl README
  
! mess.c:	$(top_builddir)/src/q2931/uni.h mkmess.pl
! 	@PERL@ $(srcdir)/mkmess.pl <$(srcdir)/../q2931/uni.h >mess.c
  

Index: sap.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/sap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sap.c	1 Jan 2008 00:14:52 -0000	1.3
--- sap.c	30 Nov 2009 16:56:52 -0000	1.4
***************
*** 19,23 ****
  #include <q.out.h>
  
- #include "common.h"
  #include "proto.h"
  #include "sap.h"
--- 19,22 ----