diff options
| -rw-r--r-- | epan/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | epan/wslua/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 2 | ||||
| -rwxr-xr-x | epan/wslua/make-init-lua.pl | 5 | ||||
| -rw-r--r-- | epan/wspython/CMakeLists.txt | 40 |
5 files changed, 15 insertions, 51 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index c41a4863d2..951d85f4e1 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -25,10 +25,7 @@ if (HAVE_LIBLUA) include( wslua/CMakeLists.txt ) endif() if (HAVE_LIBPYTHON) - add_subdirectory( wspython ) - set(WSPYTHON_LIB wspython) -else() - set(WSPYTHON_LIB ) + include( wspython/CMakeLists.txt ) endif() add_subdirectory( dissectors/dcerpc ) @@ -39,10 +36,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/dissectors ${CMAKE_CURRENT_SOURCE_DIR}/ftypes ${CMAKE_CURRENT_SOURCE_DIR}/wslua -) - -link_directories( - wspython + ${CMAKE_CURRENT_SOURCE_DIR}/wspython ) set(CRC_FILES @@ -1248,6 +1242,7 @@ set(epan_LIBS ${SMI_LIBRARIES} ${M_LIBRARIES} ${LUA_LIBRARIES} + ${PYTHON_LIBRARIES} ) set(CLEAN_FILES @@ -1268,6 +1263,7 @@ set(CLEAN_FILES ${DISSECTOR_SUPPORT_SRC} ${LIBWIRESHARK_ASM_FILES} ${WSLUA_FILES} + ${WSPYTHON_FILES} ) if (WERROR) @@ -1288,6 +1284,7 @@ add_library(epan ${LINK_MODE_LIB} ${DFILTER_FILES} ${FTYPE_FILES} ${WSLUA_FILES} + ${WSPYTHON_FILES} ${DISSECTOR_FILES} ${DISSECTOR_SUPPORT_SRC} ${LIBWIRESHARK_ASM_FILES} @@ -1298,10 +1295,6 @@ set_target_properties(epan PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS}) # but Ethereal is now named Wireshark SET_TARGET_PROPERTIES(epan PROPERTIES OUTPUT_NAME "wireshark") -target_link_libraries(epan - ${WSPYTHON_LIB} -) - target_link_libraries(epan ${epan_LIBS}) add_dependencies(epan lemon) diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt index 89fc558c8f..14c8a08086 100644 --- a/epan/wslua/CMakeLists.txt +++ b/epan/wslua/CMakeLists.txt @@ -91,7 +91,7 @@ ADD_CUSTOM_COMMAND( OUTPUT init.lua COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-init-lua.pl - ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/wslua/template-init.lua > init.lua DEPENDS diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 566ff24930..b279ec1e0c 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -114,7 +114,7 @@ dummy: touch dummy init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../../stat_menu.h - $(PERL) $(srcdir)/make-init-lua.pl $(srcdir) $(srcdir)/template-init.lua > init.lua + $(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua checkapi: $(PERL) ../../tools/checkAPIs.pl -g termoutput \ diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl index ca88c772d0..73c2bdabfb 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -28,10 +28,9 @@ use strict; -my $cd = shift; -my $WSROOT = $cd . "/../.."; +my $WSROOT = shift; -die "'$cd' is not a directory" unless -d $cd; +die "'$WSROOT' is not a directory" unless -d $WSROOT; my $wtap_encaps_table = ''; my $ft_types_table = ''; diff --git a/epan/wspython/CMakeLists.txt b/epan/wspython/CMakeLists.txt index 9287188dc5..f6dcac4da7 100644 --- a/epan/wspython/CMakeLists.txt +++ b/epan/wspython/CMakeLists.txt @@ -21,50 +21,22 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) - set(WSPYTHON_FILES - wspy_register.c - wspy_proto.c -) - -set(CLEAN_FILES - ${WSPYTHON_FILES} -) - -if (WERROR) - set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS -Werror - ) -endif() - -set(wspython_LIBS - ${PYTHON_LIBRARIES} + wspython/wspy_register.c + wspython/wspy_proto.c ) -add_library(wspython STATIC - ${WSPYTHON_FILES} -) -set_target_properties(wspython PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS}) - -target_link_libraries(wspython ${wspython_LIBS}) - install(PROGRAMS - register-dissector.py - wspy_dissector.py - wspy_libws.py + wspython/register-dissector.py + wspython/wspy_dissector.py + wspython/wspy_libws.py DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION} ) install(DIRECTORY - wspy_dissectors + wspython/wspy_dissectors DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION} PATTERN ".svn" EXCLUDE |