diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-09-29 13:41:44 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-09-29 22:51:38 +0000 |
| commit | c2f0cd5144f3f119eb9a612ba15003ac49a03536 (patch) | |
| tree | be1eae435c9adc837664b89e221b900b3ac7f18a | |
| parent | 1a949ba87bd6f48f666ab203ce509a918f583bc5 (diff) | |
Add back DIRTY_CORBA_IDL_DISSECTOR_SRC.
Add DIRTY_CORBA_IDL_DISSECTOR_SRC back to our various makefiles and move
packet-cosnaming.c back to it.
Change-Id: I2f0427ad47bf0e2f166577608da7f5feaf848a48
Reviewed-on: https://code.wireshark.org/review/10691
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | epan/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 3 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 10 |
3 files changed, 15 insertions, 4 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index c32e85be9c..efc3390fa8 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -303,6 +303,10 @@ set(DIRTY_ASN1_DISSECTOR_SRC dissectors/packet-tcap.c ) +set(DIRTY_CORBA_IDL_DISSECTOR_SRC + dissectors/packet-cosnaming.c +) + set(DISSECTOR_SRC dissectors/file-btsnoop.c dissectors/file-elf.c @@ -502,7 +506,6 @@ set(DISSECTOR_SRC dissectors/packet-corosync-totemsrp.c dissectors/packet-coseventcomm.c dissectors/packet-cosine.c - dissectors/packet-cosnaming.c dissectors/packet-couchbase.c dissectors/packet-cp2179.c dissectors/packet-cpfi.c @@ -1501,6 +1504,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 10709ed921..765c375fef 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 diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index aed2f894cb..2569177d91 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -212,6 +212,12 @@ DIRTY_ASN1_DISSECTOR_SRC = \ packet-tcap.c \ $(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC) +# +# idl2wrs-generated CORBA IDL dissectors with warnings. +# +DIRTY_CORBA_IDL_DISSECTOR_SRC = \ + packet-cosnaming.c + FILE_DISSECTOR_SRC = \ file-btsnoop.c \ file-elf.c \ @@ -415,7 +421,6 @@ DISSECTOR_SRC = \ packet-corosync-totemsrp.c \ packet-coseventcomm.c \ packet-cosine.c \ - packet-cosnaming.c \ packet-couchbase.c \ packet-cp2179.c \ packet-cpfi.c \ @@ -1792,4 +1797,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) |