diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-19 02:14:39 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-19 10:15:06 +0000 |
| commit | 7208355fb99f18b5b82d028f6af170f3dbafc8c9 (patch) | |
| tree | 0b56b2de5f3e463442fd01c68cd2d7c797f06e92 | |
| parent | 6eae09fa8edcbdc72596abdd75d922303c26354f (diff) | |
| download | wireshark-7208355fb99f18b5b82d028f6af170f3dbafc8c9.tar.gz | |
Don't put CORBA IDL dissectors in ASN1_ variables.
Put them into separate CORBA_IDL_ variables, to keep the two types of
generated dissectors separate.
Change-Id: I4eb091a76ba5bc7d73533ef38fb29adc12a8ec42
Reviewed-on: https://code.wireshark.org/review/7250
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 4 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 23 |
3 files changed, 28 insertions, 11 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index ae099b0d87..d5dc549229 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -290,16 +290,19 @@ set(ASN1_DISSECTOR_SRC ) set(DIRTY_ASN1_DISSECTOR_SRC - dissectors/packet-coseventcomm.c - dissectors/packet-cosnaming.c dissectors/packet-p1.c - dissectors/packet-parlay.c dissectors/packet-pkcs12.c dissectors/packet-snmp.c - dissectors/packet-tango.c dissectors/packet-tcap.c ) +set(DIRTY_CORBA_IDL_DISSECTOR_SRC + dissectors/packet-coseventcomm.c + dissectors/packet-cosnaming.c + dissectors/packet-parlay.c + dissectors/packet-tango.c +) + set(DISSECTOR_SRC dissectors/file-elf.c dissectors/file-file.c @@ -1473,6 +1476,7 @@ set(DISSECTOR_FILES ${PIDL_DISSECTOR_AUTOGEN_SRC} ${ASN1_DISSECTOR_SRC} ${DIRTY_ASN1_DISSECTOR_SRC} + ${DIRTY_CORBA_IDL_DISSECTOR_SRC} ${CUSTOM_DISSECTOR_SRC} ${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC} ) diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index fee8a2ec11..7afb821d51 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -26,7 +26,8 @@ AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. \ include Makefile.common libdirtydissectors_la_SOURCES = \ - $(DIRTY_ASN1_DISSECTOR_SRC) + $(DIRTY_ASN1_DISSECTOR_SRC) \ + $(DIRTY_CORBA_IDL_DISSECTOR_SRC) if HAVE_WARNINGS_AS_ERRORS AM_CLEAN_CFLAGS = -Werror @@ -38,6 +39,7 @@ libfiledissectors_la_SOURCES = \ libdissectors_la_SOURCES = \ $(DISSECTOR_SRC) \ $(ASN1_DISSECTOR_SRC) \ + $(CORBA_IDL_DISSECTOR_SRC) \ $(PIDL_DISSECTOR_SRC) \ $(DISSECTOR_SUPPORT_SRC) libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 3c853d83d4..8a5497af0e 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -198,19 +198,29 @@ ASN1_DISSECTOR_SRC = \ packet-x509sat.c # +# idl2wrs-generated CORBA IDL dissectors without warnings. +# +CORBA_IDL_DISSECTOR_SRC = + +# # asn2wrs-generated ASN.1 dissectors with warnings. -# and idl2wrs-generated dissectors +# DIRTY_ASN1_DISSECTOR_SRC = \ - packet-coseventcomm.c \ - packet-cosnaming.c \ packet-p1.c \ - packet-parlay.c \ packet-pkcs12.c \ packet-snmp.c \ - packet-tango.c \ packet-tcap.c \ $(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC) +# +# idl2wrs-generated CORBA IDL dissectors with warnings. +# +DIRTY_CORBA_IDL_DISSECTOR_SRC = \ + packet-coseventcomm.c \ + packet-cosnaming.c \ + packet-parlay.c \ + packet-tango.c + FILE_DISSECTOR_SRC = \ file-elf.c \ file-file.c \ @@ -1763,4 +1773,5 @@ ALL_DISSECTORS_SRC = \ $(FILE_DISSECTOR_SRC) \ $(PIDL_DISSECTOR_SRC) \ $(ASN1_DISSECTOR_SRC) \ - $(DIRTY_ASN1_DISSECTOR_SRC) + $(DIRTY_ASN1_DISSECTOR_SRC) \ + $(DIRTY_CORBA_IDL_DISSECTOR_SRC) |