aboutsummaryrefslogtreecommitdiffstats
path: root/ui/Makefile.common
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-09-14 20:23:18 +0000
committerGerald Combs <gerald@wireshark.org>2012-09-14 20:23:18 +0000
commit762e5ac93f08912c6daae6e83033b01332e914ab (patch)
treeb7782b13f2ffe300f89dd3144a341b33afd4c363 /ui/Makefile.common
parent670dff46e451ca0e701bdafb5c13d75c42b261f6 (diff)
Create a common libui using CMake similar to what we do with Autotools.
Move the GTK+ text import code to the common UI directory. Create wtap_encap_requires_phdr() from code in file_import_dlg.c. svn path=/trunk/; revision=44904
Diffstat (limited to 'ui/Makefile.common')
-rw-r--r--ui/Makefile.common5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/Makefile.common b/ui/Makefile.common
index adde03f0ef..3f8fd03822 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -38,11 +38,13 @@ GENERATED_FILES = \
$(DIRTY_GENERATED_C_FILES)
# Files that generate compileable files
-GENERATOR_FILES =
+GENERATOR_FILES = \
+ text_import_scanner.l
WIRESHARK_UI_SRC = \
alert_box.c \
iface_lists.c \
+ text_import.c \
util.c
noinst_HEADERS = \
@@ -55,6 +57,7 @@ noinst_HEADERS = \
recent.h \
recent_utils.h \
simple_dialog.h \
+ text_import.h \
ui_util.h \
utf8_entities.h \
util.h