diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-05-28 11:48:29 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-05-28 11:48:29 +0000 |
| commit | e37e3ba26af8b6046c39e430e798ec54b350091f (patch) | |
| tree | c049323f5cbf92fb26015c865796f598c1f98204 /epan/wslua | |
| parent | c160ddd1de5dde05193156bedd47dc9a89f92616 (diff) | |
Remaining fixes for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4788
- Compile the python code directly into epan - don't link it in as
a static lib.
- Call make-init-lua.pl with the top level directory instead of the
current directory. Change make-init-lua.pl accordingly.
svn path=/trunk/; revision=33009
Diffstat (limited to 'epan/wslua')
| -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 |
3 files changed, 4 insertions, 5 deletions
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 = ''; |