aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-02-18 00:03:42 -0800
committerGuy Harris <guy@alum.mit.edu>2015-02-18 08:04:32 +0000
commit7263af87c6b0019c1bfda0f66fdc991330941892 (patch)
tree66646302e65cdb2ab6e43274d292436e12ec4ba9 /ui
parent9707ff85cee9e0797ac9068d3560554277359bbc (diff)
Eliminate some DIRTY_ file lists.
We don't want to encourage people to add to those lists, we want to encourage people to subtract *from* those lists (either by fixing warnings or, if an infelicitous API, or an infelicitous declaration of an API on some platforms, or a program generator that doesn't take sufficient care to avoid warnings - I'm looking at *you*, Flex - makes it impossible to fix without introducing other problems, using the DIAG_OFF()/DIAG_ON() macros if possible). Eliminate the empty lists, to make it harder to fill them up again. Change-Id: I298d07952c0cb1842a4ea71ba7e07c68e94a04e9 Reviewed-on: https://code.wireshark.org/review/7229 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r--ui/cli/Makefile.common5
-rw-r--r--ui/gtk/CMakeLists.txt4
-rw-r--r--ui/qt/CMakeLists.txt11
3 files changed, 4 insertions, 16 deletions
diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common
index f261b89473..3d2bb1e086 100644
--- a/ui/cli/Makefile.common
+++ b/ui/cli/Makefile.common
@@ -28,13 +28,10 @@ GENERATED_HEADER_FILES =
GENERATED_C_FILES = \
tshark-tap-register.c
-DIRTY_GENERATED_C_FILES =
-
# All the generated files.
GENERATED_FILES = \
$(GENERATED_HEADER_FILES) \
- $(GENERATED_C_FILES) \
- $(DIRTY_GENERATED_C_FILES)
+ $(GENERATED_C_FILES)
# Files that generate compileable files
GENERATOR_FILES =
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index 3a7e95ec35..cb340bd2c9 100644
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -137,9 +137,6 @@ if(ENABLE_EXTCAP)
)
endif()
-set(WIRESHARK_DIRTY_TAP_SRC
-)
-
set(WIRESHARK_TAP_SRC
afp_stat.c
ansi_a_stat.c
@@ -246,7 +243,6 @@ register_tap_files(wireshark-tap-register.c
add_library(gtkui STATIC
${WIRESHARK_GTK_SRC}
${WIRESHARK_TAP_SRC}
- ${WIRESHARK_DIRTY_TAP_SRC}
${PLATFORM_UI_SRC}
wireshark-tap-register.c
)
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 459a1c5ff6..0b382c7241 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -227,15 +227,11 @@ set(WIRESHARK_QT_TAP_SRC
stats_tree_dialog.cpp
)
-set(CLEAN_FILES
+set(WIRESHARK_QT_FILES
${WIRESHARK_QT_SRC}
${WIRESHARK_QT_TAP_SRC}
)
-set(DIRTY_FILES
- qcustomplot.cpp
-)
-
set(WIRESHARK_QT_UI
about_dialog.ui
bluetooth_att_server_attributes_dialog.ui
@@ -349,14 +345,14 @@ endif()
if (WERROR)
set_source_files_properties(
- ${CLEAN_FILES}
+ ${WIRESHARK_QT_FILES}
PROPERTIES
COMPILE_FLAGS -Werror
)
# The Qt headers generate a ton of shortening errors on 64-bit systems.
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set_source_files_properties(
- ${CLEAN_FILES}
+ ${WIRESHARK_QT_FILES}
PROPERTIES
COMPILE_FLAGS -Wno-shorten-64-to-32
)
@@ -377,7 +373,6 @@ add_library(qtui STATIC
${WIRESHARK_QT_MOC_SRC}
${WIRESHARK_QT_QRC_SRC}
${WIRESHARK_QT_TS_QM}
- ${DIRTY_FILES}
wireshark-tap-register.c
)
set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")