diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:04:55 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:04:55 +0000 |
commit | 56735f8c160a5c648ef1b6a338a8daa6d6ae826c (patch) | |
tree | 1584f409c83e19c394f9890c8242fc975929a161 /Makefile.common | |
parent | 69eb477c9e832f614bd2ed1a21ec2945a5ccb151 (diff) |
Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.
svn path=/trunk/; revision=50654
Diffstat (limited to 'Makefile.common')
-rw-r--r-- | Makefile.common | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 8ee66f40b8..dcd139d34a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -96,12 +96,10 @@ WIRESHARK_COMMON_SRC = \ file.c \ fileset.c \ filters.c \ - g711.c \ iface_monitor.c \ merge.c \ proto_hier_stats.c \ summary.c \ - u3.c \ ws80211_utils.c # corresponding headers @@ -113,7 +111,6 @@ WIRESHARK_COMMON_INCLUDES = \ capture_opts.h \ color_filters.h \ filters.h \ - g711.h \ globals.h \ iface_monitor.h \ log.h \ @@ -122,7 +119,6 @@ WIRESHARK_COMMON_INCLUDES = \ stat_menu.h \ summary.h \ sync_pipe.h \ - u3.h \ ws80211_utils.h # tshark specifics |