aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/cli/Makefile.common5
-rw-r--r--ui/gtk/CMakeLists.txt4
-rw-r--r--ui/qt/CMakeLists.txt11
-rw-r--r--wiretap/CMakeLists.txt12
4 files changed, 6 insertions, 26 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}")
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 52b3738320..b04e0d567c 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -21,7 +21,7 @@
include(UseABICheck)
-set(CLEAN_FILES
+set(WIRETAP_FILES
5views.c
aethra.c
ascendtext.c
@@ -80,17 +80,9 @@ set(CLEAN_FILES
wtap.c
)
-set(DIRTY_FILES
-)
-
-set(WIRETAP_FILES
- ${CLEAN_FILES}
- ${DIRTY_FILES}
-)
-
if (WERROR)
set_source_files_properties(
- ${CLEAN_FILES}
+ ${WIRETAP_FILES}
PROPERTIES
COMPILE_FLAGS -Werror
)