From: chas w. <ch...@us...> - 2009-11-30 16:57:04
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18795/src/qgen Modified Files: .cvsignore Makefile.am common.c file.c first.c qgen.c ql_l.l ql_y.y second.c third.c Removed Files: TODO incl.pl mknl.pl msg.fmt op.h qtest.c Log Message: merge 2.5.1 branch into HEAD Index: .cvsignore =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 1 Jan 2008 00:14:51 -0000 1.2 --- .cvsignore 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,15 **** .deps .libs - default.nl - q.dump - q.out.c - q.out.h - q.test.c - qd.dump.c - qd.out.c - qd.out.h - qd.test.c qgen ql_l.c --- 3,6 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/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 *************** *** 1,4 **** ! noinst_PROGRAMS = qgen q.dump # q40.out.o ! check_PROGRAMS = q.test qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \ --- 1,3 ---- ! noinst_PROGRAMS = qgen qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \ *************** *** 6,64 **** qgen_LDADD = -lfl - q_dump_SOURCES = common.c - q_dump_LDADD = qd.dump.standalone.o - # FIXME: paulsch: We don't really depend on qd.dump.o or q.out.o here, but this - # trick will get it built with only a minor glitch in the dependency checking - # for q.dump. - q_dump_DEPENDENCIES = $(q_dump_LDADD) qd.dump.o q.out.o - EXTRA_q_dump_SOURCES = op.h uni.h qlib.c qlib.h - - q_test_SOURCES = qtest.c uni.h - q_test_DEPENDENCIES = q.test.c - - TARGET_CC = @CC@ CC = @CC_FOR_BUILD@ #TESTS = $(check_PROGRAMS) ! EXTRA_DIST = ql_y.h incl.pl mknl.pl msg.fmt TODO ! ! CLEANFILES = q.out.h q.out.c q.test.c qd.out.h qd.out.c qd.dump.c qd.test.c \ ! default.nl # q40.out.h q40.out.c q40.test.c ! ! NLS = atm_ai_msg atm_ai_ie atm_loc atm_cv atm_pu atm_na atm_cond atm_ie \ ! atm_msg atm_np atm_ton atm_sat atm_prs atm_scrn atm_vpa atm_poe \ ! q2931_cs atm_td atm_bc atm_tc atm_stc atm_upcc q2931_proto atm_flag \ ! atm_aalp atm_fd atm_tag atm_l2 atm_l3 atm_tt atm_mc atm_hl atm_imd \ ! atm_tdl atm_tni atm_nip atm_shi atm_oci atm_unfm atm_ofi atm_irs \ ! 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 ! # $(CPP) $(DEFS) - <uni40 | PREFIX=q40 ./qgen ! ! 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 ! # $(CC) -DUNI40 $(CFLAGS) -c q40.out.c ! ! 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 ! --- 5,12 ---- qgen_LDADD = -lfl CC = @CC_FOR_BUILD@ + CFLAGS = @CFLAGS_FOR_BUILD@ #TESTS = $(check_PROGRAMS) ! EXTRA_DIST = ql_y.h ql_y.c ql_l.c Index: common.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/common.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** common.c 9 Oct 2001 22:33:07 -0000 1.2 --- common.c 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,10 **** /* Written 1995 by Werner Almesberger, EPFL-LRC */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> #include <stdarg.h> --- 3,6 ---- Index: file.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/file.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** file.c 9 Oct 2001 22:33:07 -0000 1.2 --- file.c 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,10 **** /* Written 1995,1996 by Werner Almesberger, EPFL-LRC */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> #include <stdarg.h> --- 3,6 ---- Index: first.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/first.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** first.c 9 Oct 2001 22:33:07 -0000 1.2 --- first.c 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,10 **** /* Written 1995-1997 by Werner Almesberger, EPFL-LRC */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> #include <stdio.h> --- 3,6 ---- Index: qgen.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qgen.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** qgen.c 9 Oct 2001 22:33:07 -0000 1.2 --- qgen.c 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,10 **** /* Written 1995-2000 by Werner Almesberger, EPFL-LRC/ICA */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> #include <stdio.h> --- 3,6 ---- *************** *** 61,65 **** to_c("\n#include <stdlib.h>\n#include <stdio.h>\n"); to_c("#include <string.h>\n#include <sys/types.h>\n\n"); ! to_c("#include \"common.h\"\n#include \"op.h\"\n"); to_c("#include \"%s.out.h\"\n",prefix); to_c("#include \"qlib.h\"\n\n"); --- 57,61 ---- to_c("\n#include <stdlib.h>\n#include <stdio.h>\n"); to_c("#include <string.h>\n#include <sys/types.h>\n\n"); ! to_c("#include \"op.h\"\n"); to_c("#include \"%s.out.h\"\n",prefix); to_c("#include \"qlib.h\"\n\n"); Index: ql_l.l =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/ql_l.l,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ql_l.l 9 Oct 2001 22:33:07 -0000 1.2 --- ql_l.l 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 4,11 **** /* Written 1995,1996 by Werner Almesberger, EPFL-LRC */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdio.h> #include <string.h> --- 4,7 ---- Index: ql_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/ql_y.y,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ql_y.y 3 Mar 2009 18:23:26 -0000 1.4 --- ql_y.y 30 Nov 2009 16:56:52 -0000 1.5 *************** *** 4,11 **** /* Written 1995-1997 by Werner Almesberger, EPFL-LRC */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> #include <stdio.h> --- 4,7 ---- Index: second.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/second.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** second.c 9 Oct 2001 22:33:07 -0000 1.2 --- second.c 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,10 **** /* Written 1995-2000 by Werner Almesberger, EPFL-LRC/ICA */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> --- 3,6 ---- Index: third.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/third.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** third.c 9 Oct 2001 22:33:07 -0000 1.2 --- third.c 30 Nov 2009 16:56:52 -0000 1.3 *************** *** 3,10 **** /* Written 1995-1997 by Werner Almesberger, EPFL-LRC */ - #if HAVE_CONFIG_H - #include <config.h> - #endif - #include <stdlib.h> #include <stdio.h> --- 3,6 ---- --- TODO DELETED --- --- incl.pl DELETED --- --- mknl.pl DELETED --- --- msg.fmt DELETED --- --- op.h DELETED --- --- qtest.c DELETED --- |