diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | epan/Makefile.am | 125 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 2 |
3 files changed, 7 insertions, 134 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 5497a077dc..984b062c20 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -310,7 +310,7 @@ if(HAVE_LIBLUA) else() set(wslua_sources) endif() -add_library(epan ${LINK_MODE_LIB} +add_library(epan ${LIBWIRESHARK_FILES} ${GENERATED_FILES} $<TARGET_OBJECTS:crypt> @@ -392,13 +392,11 @@ target_link_libraries(epan ${epan_LIBS}) add_dependencies(epan lemon) -if(NOT ${ENABLE_STATIC}) - install(TARGETS epan - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -endif() +install(TARGETS epan + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) if(NOT WIN32) install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS} diff --git a/epan/Makefile.am b/epan/Makefile.am index 85f7f393ae..945c7b4803 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -431,131 +431,6 @@ tvbtest.o exntest.o oids_test.o: exceptions.h ps.c: print.ps $(top_srcdir)/tools/rdps.py $(AM_V_python)$(PYTHON) $(top_srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c -if HAVE_PLUGINS - -if ENABLE_STATIC --include ../plugins/Custom.make -plugin_src = \ - ../plugins/docsis/packet-docsis.c \ - ../plugins/docsis/packet-macmgmt.c \ - ../plugins/docsis/packet-tlv.c \ - ../plugins/docsis/packet-vendor.c \ - ../plugins/docsis/plugin.c \ - ../plugins/ethercat/packet-ams.c \ - ../plugins/ethercat/packet-ecatmb.c \ - ../plugins/ethercat/packet-esl.c \ - ../plugins/ethercat/packet-ethercat-datagram.c \ - ../plugins/ethercat/packet-ethercat-frame.c \ - ../plugins/ethercat/packet-ioraw.c \ - ../plugins/ethercat/packet-nv.c \ - ../plugins/ethercat/plugin.c \ - ../plugins/gryphon/packet-gryphon.c \ - ../plugins/gryphon/plugin.c \ - ../plugins/irda/packet-ircomm.c \ - ../plugins/irda/packet-irda.c \ - ../plugins/irda/packet-sir.c \ - ../plugins/irda/plugin.c \ - ../plugins/Makefile.am.inc \ - ../plugins/mate/mate_grammar.c \ - ../plugins/mate/mate_parser.c \ - ../plugins/mate/mate_runtime.c \ - ../plugins/mate/mate_setup.c \ - ../plugins/mate/mate_util.c \ - ../plugins/mate/packet-mate.c \ - ../plugins/mate/plugin.c \ - ../plugins/opcua/opcua_application_layer.c \ - ../plugins/opcua/opcua.c \ - ../plugins/opcua/opcua_complextypeparser.c \ - ../plugins/opcua/opcua_enumparser.c \ - ../plugins/opcua/opcua_extensionobjecttable.c \ - ../plugins/opcua/opcua_hfindeces.c \ - ../plugins/opcua/opcua_security_layer.c \ - ../plugins/opcua/opcua_serviceparser.c \ - ../plugins/opcua/opcua_servicetable.c \ - ../plugins/opcua/opcua_simpletypes.c \ - ../plugins/opcua/opcua_statuscode.c \ - ../plugins/opcua/opcua_transport_layer.c \ - ../plugins/opcua/plugin.c \ - ../plugins/pluginifdemo/pluginifdemo.c \ - ../plugins/profinet/packet-dcerpc-pn-io.c \ - ../plugins/profinet/packet-dcom-cba-acco.c \ - ../plugins/profinet/packet-dcom-cba.c \ - ../plugins/profinet/packet-pn.c \ - ../plugins/profinet/packet-pn-dcp.c \ - ../plugins/profinet/packet-pn-mrp.c \ - ../plugins/profinet/packet-pn-mrrt.c \ - ../plugins/profinet/packet-pn-ptcp.c \ - ../plugins/profinet/packet-pn-rt.c \ - ../plugins/profinet/packet-pn-rtc-one.c \ - ../plugins/profinet/plugin.c \ - ../plugins/stats_tree/pinfo_stats_tree.c \ - ../plugins/stats_tree/stats_tree_plugin.c \ - ../plugins/transum/decoders.c \ - ../plugins/transum/extractors.c \ - ../plugins/transum/packet-transum.c \ - ../plugins/transum/plugin.c \ - ../plugins/unistim/packet-unistim.c \ - ../plugins/unistim/plugin.c \ - ../plugins/wimaxasncp/packet-wimaxasncp.c \ - ../plugins/wimaxasncp/plugin.c \ - ../plugins/wimaxasncp/wimaxasncp_dict.c \ - ../plugins/wimax/crc.c \ - ../plugins/wimax/crc_data.c \ - ../plugins/wimax/mac_hd_generic_decoder.c \ - ../plugins/wimax/mac_hd_type1_decoder.c \ - ../plugins/wimax/mac_hd_type2_decoder.c \ - ../plugins/wimax/mac_mgmt_msg_decoder.c \ - ../plugins/wimaxmacphy/packet-wimaxmacphy.c \ - ../plugins/wimaxmacphy/plugin.c \ - ../plugins/wimax/msg_aas_beam.c \ - ../plugins/wimax/msg_aas_fbck.c \ - ../plugins/wimax/msg_arq.c \ - ../plugins/wimax/msg_clk_cmp.c \ - ../plugins/wimax/msg_dcd.c \ - ../plugins/wimax/msg_dlmap.c \ - ../plugins/wimax/msg_dreg.c \ - ../plugins/wimax/msg_dsa.c \ - ../plugins/wimax/msg_dsc.c \ - ../plugins/wimax/msg_dsd.c \ - ../plugins/wimax/msg_dsx_rvd.c \ - ../plugins/wimax/msg_fpc.c \ - ../plugins/wimax/msg_pkm.c \ - ../plugins/wimax/msg_pmc.c \ - ../plugins/wimax/msg_prc_lt_ctrl.c \ - ../plugins/wimax/msg_reg_req.c \ - ../plugins/wimax/msg_reg_rsp.c \ - ../plugins/wimax/msg_rep.c \ - ../plugins/wimax/msg_res_cmd.c \ - ../plugins/wimax/msg_rng_req.c \ - ../plugins/wimax/msg_rng_rsp.c \ - ../plugins/wimax/msg_sbc.c \ - ../plugins/wimax/msg_ucd.c \ - ../plugins/wimax/msg_ulmap.c \ - ../plugins/wimax/packet-wmx.c \ - ../plugins/wimax/plugin.c \ - ../plugins/wimax/wimax_cdma_code_decoder.c \ - ../plugins/wimax/wimax_compact_dlmap_ie_decoder.c \ - ../plugins/wimax/wimax_compact_ulmap_ie_decoder.c \ - ../plugins/wimax/wimax_fch_decoder.c \ - ../plugins/wimax/wimax_ffb_decoder.c \ - ../plugins/wimax/wimax_hack_decoder.c \ - ../plugins/wimax/wimax_harq_map_decoder.c \ - ../plugins/wimax/wimax_pdu_decoder.c \ - ../plugins/wimax/wimax_phy_attributes_decoder.c \ - ../plugins/wimax/wimax_tlv.c \ - ../plugins/wimax/wimax_utils.c - -else # ENABLE_STATIC - -plugin_src = - -endif # ENABLE_STATIC - -else # HAVE_PLUGINS -plugin_src = - -endif # HAVE_PLUGINS - doxygen: if HAVE_DOXYGEN $(AM_V_GEN)$(DOXYGEN) doxygen.cfg diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 8f618c3cc7..2d59455986 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -1946,7 +1946,7 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl $(srcdir)/x11-fields $( # a dissectors.c file for libwireshark. # All subsequent arguments are the files to scan. # -dissectors.c: $(plugin_src) $(ALL_DISSECTORS_SRC) Custom.common \ +dissectors.c: $(ALL_DISSECTORS_SRC) Custom.common \ $(top_srcdir)/tools/make-dissector-reg.py @echo Making dissectors.c ; \ $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ |