200-no_libfl.patch 4.9 KB

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