diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-10-09 16:33:16 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-10-09 16:33:16 +0000 |
commit | 6d93ca7c961a2ecbc08e53bd0c48e355d388af49 (patch) | |
tree | ffac2501926eac8844f93421a5e46c4fa52f6dd9 | |
parent | f4880ee5505f6fbcfe91a7012ee64a51e3206214 (diff) |
Use register_dissector_files in asn1 plugin
svn path=/trunk/; revision=30434
-rw-r--r-- | epan/CMakeLists.txt | 9 | ||||
-rw-r--r-- | plugins/asn1/CMakeLists.txt | 28 |
2 files changed, 8 insertions, 29 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index eaa21bf8e6..2e8a9e1a47 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1027,10 +1027,11 @@ set_source_files_properties( # COMPILE_FLAGS -Werror ) -register_dissector_files(register.c - dissectors - ${DISSECTOR_FILES}) - +register_dissector_files(register.c + dissectors + ${DISSECTOR_FILES} +) + set(FTYPE_FILES ftypes/ftypes.c ftypes/ftype-bytes.c diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt index ef4bee9cf7..9f9e5242dd 100644 --- a/plugins/asn1/CMakeLists.txt +++ b/plugins/asn1/CMakeLists.txt @@ -37,31 +37,9 @@ set(PLUGIN_FILES include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -ADD_CUSTOM_COMMAND( -# FIXME: Only the Python stuff has been implemented -# Make this into a MACRO, to avoid duplication with epan/ -#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \ -# $(top_srcdir)/tools/make-dissector-reg.py -# @if test -n "$(PYTHON)"; then \ -# echo Making plugin.c with python ; \ -# $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ -# plugin $(DISSECTOR_SRC) ; \ -# else \ -# echo Making plugin.c with shell script ; \ -# $(top_srcdir)/tools/make-dissector-reg $(srcdir) \ -# $(plugin_src) plugin $(DISSECTOR_SRC) ; \ -# fi - - OUTPUT plugin.c - COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py - ${CMAKE_CURRENT_SOURCE_DIR} - plugin - ${DISSECTOR_SRC} - DEPENDS - ${DISSECTOR_SRC} - ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg - ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py +register_dissector_files(plugin.c + plugin + ${DISSECTOR_SRC} ) # todo |