Fix for the LUA part of bug

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4788

- Don't build the wslua stuff as a (static) library, build the
  stuff directly into epan instead.

The wspython remains to be done.

svn path=/trunk/; revision=32992

1 files changed, 25 insertions, 51 deletions

diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index c1dacd8a3e..89fc558c8f 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -21,43 +21,28 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+# This file is to be included/run from epan/CMakeLists.txt
 
 set(WSLUA_MODULES
-	${CMAKE_CURRENT_SOURCE_DIR}/lua_bitop.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_tvb.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_proto.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_tree.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_pinfo.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_listener.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_gui.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_util.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_field.c
-	${CMAKE_CURRENT_SOURCE_DIR}/wslua_dumper.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/lua_bitop.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_tvb.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_proto.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_tree.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_pinfo.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_listener.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_gui.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_util.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_field.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dumper.c
 )
 
 set(WSLUA_FILES
 	${WSLUA_MODULES}
 	taps_wslua.c
 	register_wslua.c
-	init_wslua.c
-)
-
-set(CLEAN_FILES
-	${WSLUA_FILES}
+	wslua/init_wslua.c
 )
 
-if (WERROR)
-	set_source_files_properties(
-		${CLEAN_FILES}
-		PROPERTIES
-		COMPILE_FLAGS -Werror
-	)
-endif()
-
 # Used with untypical CWD
 set(WSLUA_TAPS_USED
 	${CMAKE_SOURCE_DIR}/epan/dissectors/packet-http.h
@@ -76,15 +61,15 @@ ADD_CUSTOM_COMMAND(
       ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c
       ${CMAKE_CURRENT_BINARY_DIR}/taps.txt
     COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-taps.pl
-      ${CMAKE_CURRENT_SOURCE_DIR}/taps
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-taps.pl
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/taps
       ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c
       ${CMAKE_CURRENT_BINARY_DIR}/taps.txt
     WORKING_DIRECTORY
-      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua
     DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/taps
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-taps.pl
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/taps
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-taps.pl
       # Only here to add dependencies for the taps "source"files
       ${WSLUA_TAPS_USED}
 )
@@ -94,10 +79,10 @@ ADD_CUSTOM_COMMAND(
       declare_wslua.h
       register_wslua.c
     COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-reg.pl
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-reg.pl
       ${WSLUA_MODULES}
     DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-reg.pl
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-reg.pl
       ${WSLUA_MODULES}
       # ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c
 )
@@ -105,40 +90,29 @@ ADD_CUSTOM_COMMAND(
 ADD_CUSTOM_COMMAND(
     OUTPUT init.lua
     COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-init-lua.pl
       ${CMAKE_CURRENT_SOURCE_DIR}
-      ${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/template-init.lua
       > init.lua
     DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl
-      ${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/make-init-lua.pl
+      ${CMAKE_CURRENT_SOURCE_DIR}/wslua/template-init.lua
       ${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h
       ${CMAKE_SOURCE_DIR}/wiretap/wtap.h
       ${CMAKE_SOURCE_DIR}/epan/epan.h
       ${CMAKE_SOURCE_DIR}/stat_menu.h
 )
 
-set(wslua_LIBS
-	${LUA_LIBRARIES}
-)
-
 add_custom_target(
      wsluaauxiliary ALL
      DEPENDS
 	init.lua
 )
 
-add_library(wslua STATIC
-	${WSLUA_FILES}
-)
-set_target_properties(wslua PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
-
-target_link_libraries(wslua ${wslua_LIBS})
-
 install(
     FILES
-	console.lua
-	dtd_gen.lua
+	wslua/console.lua
+	wslua/dtd_gen.lua
 	${CMAKE_CURRENT_BINARY_DIR}/init.lua
     DESTINATION
 	${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}