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

Archive Download this file



interactive