diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-14 20:55:11 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-14 20:55:11 +0000 |
| commit | fe6816d7fd7482e0b705c85a842a30b35a4f2e57 (patch) | |
| tree | 26adc7eb617bb99d4a3a852e4f2438f7f2dcf526 /ui | |
| parent | 9bcb9561fc1077293d9b86f399eb895daece3d9e (diff) | |
| download | wireshark-fe6816d7fd7482e0b705c85a842a30b35a4f2e57.tar.gz | |
More fixes for the text import move.
svn path=/trunk/; revision=44906
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/Makefile.am | 4 | ||||
| -rw-r--r-- | ui/Makefile.common | 7 | ||||
| -rw-r--r-- | ui/gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | ui/gtk/Makefile.common | 7 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ui/Makefile.am b/ui/Makefile.am index 670850a9f9..2b722f9f13 100644 --- a/ui/Makefile.am +++ b/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) \ diff --git a/ui/Makefile.common b/ui/Makefile.common index 3f8fd03822..7bad41ae33 100644 --- a/ui/Makefile.common +++ b/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 diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index f410bddc91..a531ba0b38 100644 --- a/ui/gtk/Makefile.am +++ b/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()" diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common index f12d0fc214..87fc1648d6 100644 --- a/ui/gtk/Makefile.common +++ b/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 \ |