diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
| commit | 0a669967fa719111db64437f7dd3b2869091f9e8 (patch) | |
| tree | 35aa1a3589fe2927087c1482683afaccb0183c89 /wiretap/Makefile.common | |
| parent | d331c33b4ff4f5ce6c001a040db5ba1a0ded1c60 (diff) | |
| download | wireshark-0a669967fa719111db64437f7dd3b2869091f9e8.tar.gz | |
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
Diffstat (limited to 'wiretap/Makefile.common')
| -rw-r--r-- | wiretap/Makefile.common | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common index 8726adbb2e..eb54501c61 100644 --- a/wiretap/Makefile.common +++ b/wiretap/Makefile.common @@ -57,6 +57,7 @@ NONGENERATED_C_FILES = \ k12.c \ lanalyzer.c \ libpcap.c \ + merge.c \ mpeg.c \ mp2t.c \ netmon.c \ @@ -113,6 +114,7 @@ NONGENERATED_HEADER_FILES = \ lanalyzer.h \ libpcap.h \ mpeg.h \ + mpeg.h \ mp2t.h \ netmon.h \ netscreen.h \ |