aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-10-12 17:44:04 +0200
committerMichael Mann <mmann78@netscape.net>2014-10-12 17:46:58 +0000
commit4e328e47098501c65f751774b8a13493f44b7214 (patch)
treebc27d83f44f88d4f6c974a6642777b74917e9d20
parentd62b323c5e29cf42c505b57a44e569f13de4fec7 (diff)
DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC
Now mapi and drsuapi build without warning ! Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58 Reviewed-on: https://code.wireshark.org/review/4619 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/CMakeLists.txt6
-rw-r--r--epan/dissectors/Makefile.am3
-rw-r--r--epan/dissectors/Makefile.common11
3 files changed, 4 insertions, 16 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index a39b6a910c..9afd2ba025 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -178,17 +178,14 @@ set(PIDL_DISSECTOR_SRC
dissectors/packet-dcerpc-nspi.c
dissectors/packet-dcerpc-mdssvc.c
dissectors/packet-dcerpc-misc.c
+ dissectors/packet-dcerpc-mapi.c
dissectors/packet-dcerpc-rfr.c
dissectors/packet-dcerpc-srvsvc.c
dissectors/packet-dcerpc-winreg.c
dissectors/packet-dcerpc-wkssvc.c
dissectors/packet-dcerpc-wzcsvc.c
)
-set(DIRTY_PIDL_DISSECTOR_SRC
- dissectors/packet-dcerpc-mapi.c
-
-)
set(ASN1_DISSECTOR_SRC
dissectors/packet-acp133.c
dissectors/packet-acse.c
@@ -1452,7 +1449,6 @@ set(DISSECTOR_FILES
${DIRTY_DISSECTOR_SRC}
${PIDL_DISSECTOR_SRC}
${PIDL_DISSECTOR_AUTOGEN_SRC}
- ${DIRTY_PIDL_DISSECTOR_SRC}
${ASN1_DISSECTOR_SRC}
${DIRTY_ASN1_DISSECTOR_SRC}
${CUSTOM_DISSECTOR_SRC}
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 1712fec8f5..7080bd1225 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -27,8 +27,7 @@ include Makefile.common
libdirtydissectors_la_SOURCES = \
$(DIRTY_DISSECTOR_SRC) \
- $(DIRTY_ASN1_DISSECTOR_SRC) \
- $(DIRTY_PIDL_DISSECTOR_SRC)
+ $(DIRTY_ASN1_DISSECTOR_SRC)
if HAVE_WARNINGS_AS_ERRORS
AM_CLEAN_CFLAGS = -Werror
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 04187fef65..480673f46f 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -50,6 +50,7 @@ PIDL_DISSECTOR_SRC = \
packet-dcerpc-butc.c \
packet-dcerpc-dfs.c \
packet-dcerpc-dnsserver.c \
+ packet-dcerpc-drsuapi.c \
packet-dcerpc-dssetup.c \
packet-dcerpc-efs.c \
packet-dcerpc-eventlog.c \
@@ -57,6 +58,7 @@ PIDL_DISSECTOR_SRC = \
packet-dcerpc-initshutdown.c \
packet-dcerpc-lsa.c \
packet-dcerpc-mdssvc.c \
+ packet-dcerpc-mapi.c \
packet-dcerpc-misc.c \
packet-dcerpc-nspi.c \
packet-dcerpc-rfr.c \
@@ -65,14 +67,6 @@ PIDL_DISSECTOR_SRC = \
packet-dcerpc-wkssvc.c \
packet-dcerpc-wzcsvc.c
-
-#
-# PIDL-generated DCE RPC dissectors with warnings.
-#
-DIRTY_PIDL_DISSECTOR_SRC = \
- packet-dcerpc-drsuapi.c \
- packet-dcerpc-mapi.c
-
#
# Headers for PIDL-generated dissectors.
#
@@ -1750,6 +1744,5 @@ ALL_DISSECTORS_SRC = \
$(FILE_DISSECTOR_SRC) \
$(DIRTY_DISSECTOR_SRC) \
$(PIDL_DISSECTOR_SRC) \
- $(DIRTY_PIDL_DISSECTOR_SRC) \
$(ASN1_DISSECTOR_SRC) \
$(DIRTY_ASN1_DISSECTOR_SRC)