Move merge.{h,c} into wiretap: these modules use wiretap to merge files.

[metze/wireshark/wip.git] / wiretap / CMakeLists.txt

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 1ddbcfdbf16f076a60442e78b6b3ee5fb45d4af4..4dcacdbd4625282c3d665b2d5f2bbbd9184d018f 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -50,6 +50,7 @@ set(WIRETAP_FILES
        k12.c
        lanalyzer.c
        libpcap.c
+       merge.c
        mpeg.c
        mime_file.c
        mp2t.c