diff options
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index dcd139d34a..b4dab9ae88 100644 --- a/Makefile.common +++ b/Makefile.common @@ -97,7 +97,6 @@ WIRESHARK_COMMON_SRC = \ fileset.c \ filters.c \ iface_monitor.c \ - merge.c \ proto_hier_stats.c \ summary.c \ ws80211_utils.c @@ -114,7 +113,6 @@ WIRESHARK_COMMON_INCLUDES = \ globals.h \ iface_monitor.h \ log.h \ - merge.h \ proto_hier_stats.h \ stat_menu.h \ summary.h \ @@ -145,8 +143,7 @@ text2pcap_INCLUDES = \ # mergecap specifics mergecap_SOURCES = \ - mergecap.c \ - merge.c + mergecap.c # editcap specifics editcap_SOURCES = \ |