aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2011-06-28 15:04:24 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2011-06-28 15:04:24 +0000
commite8a173f8e0fb0b2312c54be9826f7d53e65b6423 (patch)
treedaa90dad5e5b96a2ea8b5d0823581e3734411b2f
parentc3290dfa9bd9e071ff4f60799f149c890bfb61f7 (diff)
Use the generated header file from Guy's Flex front-end script from
revision 22446 for text_import_scanner. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37815 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--gtk/Makefile.am2
-rw-r--r--gtk/Makefile.common4
-rw-r--r--gtk/text_import_scanner.l1
3 files changed, 7 insertions, 0 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bd679dee3f..91c0aaba06 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -41,6 +41,8 @@ MAINTAINERCLEANFILES = \
RUNLEX=$(top_srcdir)/tools/runlex.sh
+text_import_scanner_lex.h: text_import_scanner.c
+
wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) $(top_srcdir)/tools/make-tapreg-dotc
@echo Making wireshark-tap-register.c
@$(top_srcdir)/tools/make-tapreg-dotc wireshark-tap-register.c $(srcdir) $(WIRESHARK_TAP_SRC)
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index e4bb923d75..c9fb22a25d 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -30,6 +30,9 @@ GENERATED_HEADER_FILES =
GENERATED_C_FILES = \
wireshark-tap-register.c
+GENERATED_H_FILES = \
+ text_import_scanner_lex.h
+
DIRTY_GENERATED_C_FILES = \
text_import_scanner.c
@@ -37,6 +40,7 @@ DIRTY_GENERATED_C_FILES = \
GENERATED_FILES = \
$(GENERATED_HEADER_FILES) \
$(GENERATED_C_FILES) \
+ $(GENERATED_H_FILES) \
$(DIRTY_GENERATED_C_FILES)
# Files that generate compileable files
diff --git a/gtk/text_import_scanner.l b/gtk/text_import_scanner.l
index 5a715284a2..bd59c749d6 100644
--- a/gtk/text_import_scanner.l
+++ b/gtk/text_import_scanner.l
@@ -52,6 +52,7 @@
#include <stdlib.h>
#include "text_import_scanner.h"
+#include "text_import_scanner_lex.h"
/*
* Flex (v 2.5.35) uses this symbol to "exclude" unistd.h