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 /wsutil/Makefile.common | |
| parent | 69eb477c9e832f614bd2ed1a21ec2945a5ccb151 (diff) | |
| download | wireshark-56735f8c160a5c648ef1b6a338a8daa6d6ae826c.tar.gz | |
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 'wsutil/Makefile.common')
| -rw-r--r-- | wsutil/Makefile.common | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index dd15f9fb51..8e2903bef5 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -40,6 +40,7 @@ LIBWSUTIL_SRC = \ crc16-plain.c \ crc32.c \ crcdrm.c \ + g711.c \ mpeg-audio.c \ nstime.c \ privileges.c \ @@ -47,7 +48,8 @@ LIBWSUTIL_SRC = \ str_util.c \ report_err.c \ tempfile.c \ - type_util.c + type_util.c \ + u3.c # Header files that are not generated from other files LIBWSUTIL_INCLUDES = \ @@ -61,6 +63,7 @@ LIBWSUTIL_INCLUDES = \ crc16-plain.h \ crc32.h \ crcdrm.h \ + g711.h \ mpeg-audio.h \ nstime.h \ privileges.h \ @@ -68,4 +71,5 @@ LIBWSUTIL_INCLUDES = \ str_util.h \ report_err.h \ tempfile.h \ - type_util.h + type_util.h \ + u3.h |