More fixes for the text import move.

svn path=/trunk/; revision=44906

ui/Makefile.am

@@ -39,6 +39,10 @@ MAINTAINERCLEANFILES = \
 	$(GENERATED_FILES)	\
 	Makefile.in
 
+RUNLEX=$(top_srcdir)/tools/runlex.sh
+
+text_import_scanner_lex.h: text_import_scanner.c
+
 # All sources that should be put in the source distribution tarball
 libui_a_SOURCES = \
 	$(WIRESHARK_UI_SRC) \

ui/Makefile.common

@@ -24,12 +24,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Generated header files that we want in the distribution.
-GENERATED_HEADER_FILES =
+GENERATED_HEADER_FILES = \
+	text_import_scanner_lex.h
 
 # Generated C source files that we want in the distribution.
 GENERATED_C_FILES =
 
-DIRTY_GENERATED_C_FILES =
+DIRTY_GENERATED_C_FILES = \
+	text_import_scanner.c
 
 # All the generated files we want in the distribution.
 GENERATED_FILES = \
@@ -58,6 +60,7 @@ noinst_HEADERS = \
 	recent_utils.h		\
 	simple_dialog.h		\
 	text_import.h		\
+	text_import_scanner.h	\
 	ui_util.h		\
 	utf8_entities.h		\
 	util.h

ui/gtk/Makefile.am

@@ -39,10 +39,6 @@ MAINTAINERCLEANFILES = \
 	$(GENERATED_FILES)	\
 	Makefile.in
 
-RUNLEX=$(top_srcdir)/tools/runlex.sh
-
-text_import_scanner_lex.h: text_import_scanner.c
-
 #
 # Build "wireshark-tap-register.c", which contains a function
 # "register_all_tap_listeners()"

ui/gtk/Makefile.common

@@ -27,15 +27,13 @@
 include Makefile_custom.common
 
 # Generated header files that we want in the distribution.
-GENERATED_HEADER_FILES = \
-	text_import_scanner_lex.h
+GENERATED_HEADER_FILES =
 
 # Generated C source files that we want in the distribution.
 GENERATED_C_FILES = \
 	wireshark-tap-register.c
 
-DIRTY_GENERATED_C_FILES = \
-	text_import_scanner.c
+DIRTY_GENERATED_C_FILES =
 
 # All the generated files.
 GENERATED_FILES = \
@@ -341,7 +339,6 @@ noinst_HEADERS = \
 	summary_dlg.h   \
 	supported_protos_dlg.h   \
 	tap_param_dlg.h	\
-	text_import_scanner.h	\
 	text_page_utils.h	\
 	uat_gui.h \
 	voip_calls.h	\