200-no_libfl.patch 4.6 KB

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