summaryrefslogtreecommitdiff
path: root/epan/Makefile.common
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-03 17:15:23 -0500
committerAnders Broman <a.broman58@gmail.com>2015-02-04 06:59:55 +0000
commit7ced085550d030ea10525d650c8d5d8dc7c99684 (patch)
tree8e511be2b9ce9f43c08ee7d234a311a3c56ef8d7 /epan/Makefile.common
parent90a76e0d51faed8aff875eafce0a85e39de6ae5f (diff)
downloadwireshark-7ced085550d030ea10525d650c8d5d8dc7c99684.tar.gz
emem is dead! Long live wmem!
Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77 Reviewed-on: https://code.wireshark.org/review/6939 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/Makefile.common')
-rw-r--r--epan/Makefile.common2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 452be860a1..c9e171089e 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -46,7 +46,6 @@ LIBWIRESHARK_SRC = \
dissector_filters.c \
dvb_chartbl.c \
dwarf.c \
- emem.c \
epan.c \
ex-opt.c \
except.c \
@@ -181,7 +180,6 @@ LIBWIRESHARK_INCLUDES = \
dwarf.h \
eap.h \
eapol_keydes_types.h \
- emem.h \
epan-int.h \
epan.h \
epan_dissect.h \