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>
This commit is contained in:
parent
6eae09fa8e
commit
7208355fb9
|
@ -290,16 +290,19 @@ set(ASN1_DISSECTOR_SRC
|
||||||
)
|
)
|
||||||
|
|
||||||
set(DIRTY_ASN1_DISSECTOR_SRC
|
set(DIRTY_ASN1_DISSECTOR_SRC
|
||||||
dissectors/packet-coseventcomm.c
|
|
||||||
dissectors/packet-cosnaming.c
|
|
||||||
dissectors/packet-p1.c
|
dissectors/packet-p1.c
|
||||||
dissectors/packet-parlay.c
|
|
||||||
dissectors/packet-pkcs12.c
|
dissectors/packet-pkcs12.c
|
||||||
dissectors/packet-snmp.c
|
dissectors/packet-snmp.c
|
||||||
dissectors/packet-tango.c
|
|
||||||
dissectors/packet-tcap.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
|
set(DISSECTOR_SRC
|
||||||
dissectors/file-elf.c
|
dissectors/file-elf.c
|
||||||
dissectors/file-file.c
|
dissectors/file-file.c
|
||||||
|
@ -1473,6 +1476,7 @@ set(DISSECTOR_FILES
|
||||||
${PIDL_DISSECTOR_AUTOGEN_SRC}
|
${PIDL_DISSECTOR_AUTOGEN_SRC}
|
||||||
${ASN1_DISSECTOR_SRC}
|
${ASN1_DISSECTOR_SRC}
|
||||||
${DIRTY_ASN1_DISSECTOR_SRC}
|
${DIRTY_ASN1_DISSECTOR_SRC}
|
||||||
|
${DIRTY_CORBA_IDL_DISSECTOR_SRC}
|
||||||
${CUSTOM_DISSECTOR_SRC}
|
${CUSTOM_DISSECTOR_SRC}
|
||||||
${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
|
${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
|
||||||
)
|
)
|
||||||
|
|
|
@ -26,7 +26,8 @@ AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. \
|
||||||
include Makefile.common
|
include Makefile.common
|
||||||
|
|
||||||
libdirtydissectors_la_SOURCES = \
|
libdirtydissectors_la_SOURCES = \
|
||||||
$(DIRTY_ASN1_DISSECTOR_SRC)
|
$(DIRTY_ASN1_DISSECTOR_SRC) \
|
||||||
|
$(DIRTY_CORBA_IDL_DISSECTOR_SRC)
|
||||||
|
|
||||||
if HAVE_WARNINGS_AS_ERRORS
|
if HAVE_WARNINGS_AS_ERRORS
|
||||||
AM_CLEAN_CFLAGS = -Werror
|
AM_CLEAN_CFLAGS = -Werror
|
||||||
|
@ -38,6 +39,7 @@ libfiledissectors_la_SOURCES = \
|
||||||
libdissectors_la_SOURCES = \
|
libdissectors_la_SOURCES = \
|
||||||
$(DISSECTOR_SRC) \
|
$(DISSECTOR_SRC) \
|
||||||
$(ASN1_DISSECTOR_SRC) \
|
$(ASN1_DISSECTOR_SRC) \
|
||||||
|
$(CORBA_IDL_DISSECTOR_SRC) \
|
||||||
$(PIDL_DISSECTOR_SRC) \
|
$(PIDL_DISSECTOR_SRC) \
|
||||||
$(DISSECTOR_SUPPORT_SRC)
|
$(DISSECTOR_SUPPORT_SRC)
|
||||||
libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS)
|
libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||||
|
|
|
@ -197,20 +197,30 @@ ASN1_DISSECTOR_SRC = \
|
||||||
packet-x509if.c \
|
packet-x509if.c \
|
||||||
packet-x509sat.c
|
packet-x509sat.c
|
||||||
|
|
||||||
|
#
|
||||||
|
# idl2wrs-generated CORBA IDL dissectors without warnings.
|
||||||
|
#
|
||||||
|
CORBA_IDL_DISSECTOR_SRC =
|
||||||
|
|
||||||
#
|
#
|
||||||
# asn2wrs-generated ASN.1 dissectors with warnings.
|
# asn2wrs-generated ASN.1 dissectors with warnings.
|
||||||
# and idl2wrs-generated dissectors
|
#
|
||||||
DIRTY_ASN1_DISSECTOR_SRC = \
|
DIRTY_ASN1_DISSECTOR_SRC = \
|
||||||
packet-coseventcomm.c \
|
|
||||||
packet-cosnaming.c \
|
|
||||||
packet-p1.c \
|
packet-p1.c \
|
||||||
packet-parlay.c \
|
|
||||||
packet-pkcs12.c \
|
packet-pkcs12.c \
|
||||||
packet-snmp.c \
|
packet-snmp.c \
|
||||||
packet-tango.c \
|
|
||||||
packet-tcap.c \
|
packet-tcap.c \
|
||||||
$(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC)
|
$(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_DISSECTOR_SRC = \
|
||||||
file-elf.c \
|
file-elf.c \
|
||||||
file-file.c \
|
file-file.c \
|
||||||
|
@ -1763,4 +1773,5 @@ ALL_DISSECTORS_SRC = \
|
||||||
$(FILE_DISSECTOR_SRC) \
|
$(FILE_DISSECTOR_SRC) \
|
||||||
$(PIDL_DISSECTOR_SRC) \
|
$(PIDL_DISSECTOR_SRC) \
|
||||||
$(ASN1_DISSECTOR_SRC) \
|
$(ASN1_DISSECTOR_SRC) \
|
||||||
$(DIRTY_ASN1_DISSECTOR_SRC)
|
$(DIRTY_ASN1_DISSECTOR_SRC) \
|
||||||
|
$(DIRTY_CORBA_IDL_DISSECTOR_SRC)
|
||||||
|
|
Loading…
Reference in New Issue