CVS: linux-atm/src/sigd Makefile.am, 1.2.2.1, 1.2.2.1.2.1 sap.c, 1.2.2.2, 1.2.2.2.2.1

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

Update of /cvsroot/linux-atm/linux-atm/src/sigd
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4419/src/sigd

Modified Files:
      Tag: V2_5_1
	Makefile.am sap.c 
Log Message:
in order to make cross compling more sane and easier to follow, we
split qgen (which is the only program that needs to be built and run on
the host system) into qgen and q2931.

so qgen now contains only host system binaries and as such doesnt need
HAVE_CONFIG_H since that is really meant for the target system.

also added the CFLAGS_FOR_BUILD flag that overrides CFLAGS in
src/qgen. automake complains about this but i dont see a better way
really unless i rewrite COMPILE.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/Makefile.am,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.1.2.1
diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1
*** Makefile.am	2 May 2003 13:47:14 -0000	1.2.2.1
--- Makefile.am	3 Aug 2009 20:36:57 -0000	1.2.2.1.2.1
***************
*** 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.2.2.2
retrieving revision 1.2.2.2.2.1
diff -C2 -d -r1.2.2.2 -r1.2.2.2.2.1
*** sap.c	22 Nov 2005 20:14:52 -0000	1.2.2.2
--- sap.c	3 Aug 2009 20:36:57 -0000	1.2.2.2.2.1
***************
*** 19,23 ****
  #include <q.out.h>
  
- #include "common.h"
  #include "proto.h"
  #include "sap.h"
--- 19,22 ----