package/linux-atm/patches/200-no_libfl.patch

   1 --- a/src/qgen/Makefile.am
   2 +++ b/src/qgen/Makefile.am
   3 @@ -2,7 +2,7 @@ noinst_PROGRAMS = qgen
   4
   5  qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
   6                 qgen.h second.c third.c
   7 -qgen_LDADD = -lfl
   8 +qgen_LDADD =
   9
  10  COMPILE = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@
  11  LINK = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@
  12 --- a/src/qgen/Makefile.in
  13 +++ b/src/qgen/Makefile.in
  14 @@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@
  15  qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
  16                 qgen.h second.c third.c
  17
  18 -qgen_LDADD = -lfl
  19 +qgen_LDADD =
  20  COMPILE = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@
  21  LINK = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@
  22
  23 --- a/src/sigd/Makefile.am
  24 +++ b/src/sigd/Makefile.am
  25 @@ -8,7 +8,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
  26                         $(top_builddir)/src/q2931/qd.dump.o \
  27                         $(top_builddir)/src/lib/libatm.la \
  28                         $(top_builddir)/src/saal/libsaal.a
  29 -atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
  30 +atmsigd_LDADD = $(atmsigd_XTRAS)
  31  atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
  32
  33  CLEANFILES = mess.c
  34 --- a/src/sigd/Makefile.in
  35 +++ b/src/sigd/Makefile.in
  36 @@ -245,7 +245,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
  37                         $(top_builddir)/src/lib/libatm.la \
  38                         $(top_builddir)/src/saal/libsaal.a
  39
  40 -atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
  41 +atmsigd_LDADD = $(atmsigd_XTRAS)
  42  atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
  43  CLEANFILES = mess.c
  44  sysconf_DATA = atmsigd.conf
  45 --- a/src/switch/debug/debug.c
  46 +++ b/src/switch/debug/debug.c
  47 @@ -20,6 +20,11 @@
  48
  49  #define PRV(call) ((FAB *) (call)->fab)
  50
  51 +int yywrap(void)
  52 +{
  53 +        return 1;
  54 +}
  55 +
  56
  57  typedef struct _fab {
  58      CALL *next; /* relay.c may not keep track of calls, but WE are */
  59 --- a/src/switch/debug/Makefile.am
  60 +++ b/src/switch/debug/Makefile.am
  61 @@ -5,7 +5,7 @@ INCLUDES = -I$(srcdir)/../../q2931
  62  sw_debug_SOURCES = debug.c
  63  sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
  64                         $(top_builddir)/src/lib/libatm.la
  65 -sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
  66 +sw_debug_LDADD = $(sw_debug_XTRAS)
  67
  68  sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
  69
  70 --- a/src/switch/debug/Makefile.in
  71 +++ b/src/switch/debug/Makefile.in
  72 @@ -200,7 +200,8 @@ sw_debug_SOURCES = debug.c
  73  sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
  74                         $(top_builddir)/src/lib/libatm.la
  75
  76 -sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
  77 +sw_debug_LDADD = $(sw_debug_XTRAS)
  78 +
  79  sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
  80  EXTRA_DIST = demo README
  81  all: all-am
  82 --- a/src/switch/tcp/Makefile.am
  83 +++ b/src/switch/tcp/Makefile.am
  84 @@ -5,7 +5,7 @@ INCLUDES = -I$(srcdir)/../../q2931
  85  sw_tcp_SOURCES = tcpsw.c
  86  sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
  87                 $(top_builddir)/src/lib/libatm.la
  88 -sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
  89 +sw_tcp_LDADD = $(sw_tcp_XTRAS)
  90  sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
  91
  92  EXTRA_DIST = mkfiles README
  93 --- a/src/switch/tcp/Makefile.in
  94 +++ b/src/switch/tcp/Makefile.in
  95 @@ -200,7 +200,7 @@ sw_tcp_SOURCES = tcpsw.c
  96  sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
  97                 $(top_builddir)/src/lib/libatm.la
  98
  99 -sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
 100 +sw_tcp_LDADD = $(sw_tcp_XTRAS)
 101  sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
 102  EXTRA_DIST = mkfiles README
 103  all: all-am
 104 --- a/src/switch/tcp/tcpsw.c
 105 +++ b/src/switch/tcp/tcpsw.c
 106 @@ -35,6 +35,10 @@
 107  #define MAX_PACKET (ATM_MAX_AAL5_PDU+sizeof(struct atmtcp_hdr))
 108  #define BUFFER_SIZE (MAX_PACKET*2)
 109
 110 +int yywrap(void)
 111 +{
 112 +        return 1;
 113 +}
 114
 115  typedef struct _table {
 116      struct _link *out; /* output port */
 117 --- a/src/test/Makefile.am
 118 +++ b/src/test/Makefile.am
 119 @@ -20,7 +20,7 @@ br_SOURCES = br.c
 120  bw_SOURCES = bw.c
 121  isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
 122  isp_XTRAS = $(LDADD)
 123 -isp_LDADD = $(isp_XTRAS) -lfl
 124 +isp_LDADD = $(isp_XTRAS)
 125  isp_DEPENDENCIES = $(isp_XTRAS)
 126  window_SOURCES = window.c
 127
 128 --- a/src/test/Makefile.in
 129 +++ b/src/test/Makefile.in
 130 @@ -283,7 +283,7 @@ br_SOURCES = br.c
 131  bw_SOURCES = bw.c
 132  isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
 133  isp_XTRAS = $(LDADD)
 134 -isp_LDADD = $(isp_XTRAS) -lfl
 135 +isp_LDADD = $(isp_XTRAS)
 136  isp_DEPENDENCIES = $(isp_XTRAS)
 137  window_SOURCES = window.c
 138  CLEANFILES = errnos.inc
 139 --- a/src/test/ispl_l.l
 140 +++ b/src/test/ispl_l.l
 141 @@ -18,6 +18,11 @@
 142  #include "ispl_y.h"
 143
 144
 145 +int yywrap(void)
 146 +{
 147 +       return 1;
 148 +}
 149 +
 150  static int lineno = 1;
 151
 152  %}
 153 --- a/src/qgen/ql_l.l
 154 +++ b/src/qgen/ql_l.l
 155 @@ -11,6 +11,11 @@
 156  #include "ql_y.h"
 157
 158
 159 +int yywrap(void)
 160 +{
 161 +        return 1;
 162 +}
 163 +
 164  typedef struct _tree {
 165      struct _tree *left,*right;
 166      const char str[0];
 167 --- a/src/sigd/cfg_l.l
 168 +++ b/src/sigd/cfg_l.l
 169 @@ -16,6 +16,10 @@
 170
 171  #include "cfg_y.h"
 172
 173 +int yywrap(void)
 174 +{
 175 +        return 1;
 176 +}
 177
 178  static int lineno = 1;
 179  static int token; /* f@#%ing flex doesn't grok return after BEGIN */