CVS: linux-atm/src/qgen .cvsignore, 1.1, 1.2 Makefile.am, 1.2, 1.3 qlib.c, 1.2, 1.3 qlib.h, 1.2, 1.3 uni.h, 1.2, 1.3

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

Update of /cvsroot/linux-atm/linux-atm/src/qgen
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/qgen

Modified Files:
	Makefile.am qlib.c qlib.h uni.h 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	9 Oct 2001 22:33:07 -0000	1.2
--- Makefile.am	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 17,20 ****
--- 17,23 ----
  q_test_DEPENDENCIES = q.test.c
  
+ TARGET_CC = @CC@
+ CC = @CC_FOR_BUILD@
+ 
  #TESTS = $(check_PROGRAMS)
  
***************
*** 31,43 ****
  	atm_it atm_lit atm_lsi atm_tcs atm_css atm_eqo atm_eqp atm_aap \
  	atm_asp atm_tor
! SYMFILES = uni.h $(shell @PERL@ incl.pl $(CFLAGS) linux/atmsap.h)
  
  
  default.nl: mknl.pl $(SYMFILES)
! 	cat $(SYMFILES) | @PERL@ mknl.pl $(NLS) >default.nl || \
  	{ rm -f default.nl; echo 1; }
  
  q.out.h q.out.c q.test.c: qgen msg.fmt default.nl
! 	$(CPP) $(DEFS) - <msg.fmt | ./qgen
  
  #q40.out.h q40.out.c q40.test.c: qgen uni40 default.nl
--- 34,46 ----
  	atm_it atm_lit atm_lsi atm_tcs atm_css atm_eqo atm_eqp atm_aap \
  	atm_asp atm_tor
! SYMFILES = $(srcdir)/uni.h $(shell @PERL@ $(srcdir)/incl.pl $(CFLAGS) linux/atmsap.h)
  
  
  default.nl: mknl.pl $(SYMFILES)
! 	cat $(SYMFILES) | @PERL@ $(srcdir)/mknl.pl $(NLS) >default.nl || \
  	{ rm -f default.nl; echo 1; }
  
  q.out.h q.out.c q.test.c: qgen msg.fmt default.nl
! 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) - < $(srcdir)/msg.fmt | ./qgen
  
  #q40.out.h q40.out.c q40.test.c: qgen uni40 default.nl
***************
*** 45,52 ****
  
  qd.out.h qd.out.c qd.dump.c: qgen msg.fmt default.nl
! 	$(CPP) $(DEFS) - <msg.fmt | ./qgen -D
  
  q.out.o: q.out.c q.out.h qlib.c qlib.h
! 	$(CC) $(DEFS) $(CFLAGS) -c q.out.c
  
  #q40.out.o: q40.out.c q40.out.h qlib.c qlib.h
--- 48,55 ----
  
  qd.out.h qd.out.c qd.dump.c: qgen msg.fmt default.nl
! 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) - < $(srcdir)/msg.fmt | ./qgen -D
  
  q.out.o: q.out.c q.out.h qlib.c qlib.h
! 	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c q.out.c
  
  #q40.out.o: q40.out.c q40.out.h qlib.c qlib.h
***************
*** 54,61 ****
  
  qd.dump.o: qd.dump.c qd.out.c qlib.c qlib.h
! 	$(CC) $(DEFS) $(CFLAGS) -c qd.dump.c
  
  qd.dump.standalone.o: qd.dump.c qd.out.c qlib.c qlib.h
! 	$(CC) $(DEFS) -DSTANDALONE $(CFLAGS) -c qd.dump.c \
  	-o qd.dump.standalone.o
  
--- 57,64 ----
  
  qd.dump.o: qd.dump.c qd.out.c qlib.c qlib.h
! 	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c qd.dump.c
  
  qd.dump.standalone.o: qd.dump.c qd.out.c qlib.c qlib.h
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) -DSTANDALONE $(CFLAGS) -c qd.dump.c \
  	-o qd.dump.standalone.o
  

Index: qlib.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qlib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qlib.c	9 Oct 2001 22:33:07 -0000	1.2
--- qlib.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 27,31 ****
  
  
! static int debug = 0;
  
  
--- 27,31 ----
  
  
! int debug = 0;
  
  

Index: qlib.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qlib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qlib.h	9 Oct 2001 22:33:07 -0000	1.2
--- qlib.h	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 24,28 ****
--- 24,30 ----
  
  
+ #ifndef DUMP_MODE
  extern int q_dump;
+ #endif
  extern void q_report(int severity,const char *msg,...);
  

Index: uni.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/uni.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uni.h	9 Oct 2001 22:33:07 -0000	1.2
--- uni.h	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 395,399 ****
  #define ATM_TDL_CUM		0x01 /* Cumulative transit delay value */
  #define ATM_TDL_E2EMAX		0x03 /* Maximum end-to-end transit delay value*/
! #define ATM_TDL_NGI		0x06 /* Network generated indicator */
  
  /* Transit network identification */
--- 395,399 ----
  #define ATM_TDL_CUM		0x01 /* Cumulative transit delay value */
  #define ATM_TDL_E2EMAX		0x03 /* Maximum end-to-end transit delay value*/
! #define ATM_TDL_NGI		0x0a /* Network generated indicator */
  
  /* Transit network identification */