Get us building with the subdir-objects automake option.

subdir-objects will be enabled unconditionally in automake-2.0 and
automake-1.14 gives us warnings about the upcoming change.

Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
the source files rather than the full path to each.

In echld don't use sources in the top-level directory in libechld: it breaks
distclean with subdir-objects turned on.

Bug: 10648
Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
Reviewed-on: https://code.wireshark.org/review/6697
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

2 files changed, 48 insertions, 33 deletions

diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 26f43e1b35..6d2caa47dd 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -28,24 +28,24 @@ AM_CPPFLAGS = -I$(top_srcdir) @LUA_INCLUDES@
 noinst_LTLIBRARIES = libwslua.la
 
 wslua_modules = 	\
-	$(srcdir)/lua_bitop.c \
-	$(srcdir)/lrexlib.c \
-	$(srcdir)/lrexlib_glib.c \
-	$(srcdir)/lrexlib_glib_f.c \
-	$(srcdir)/wslua_tvb.c \
-	$(srcdir)/wslua_proto.c \
-	$(srcdir)/wslua_int64.c \
-	$(srcdir)/wslua_tree.c \
-	$(srcdir)/wslua_pinfo.c \
-	$(srcdir)/wslua_listener.c \
-	$(srcdir)/wslua_gui.c \
-	$(srcdir)/wslua_dir.c \
-	$(srcdir)/wslua_util.c \
-	$(srcdir)/wslua_field.c \
-	$(srcdir)/wslua_file.c \
-	$(srcdir)/wslua_struct.c \
-	$(srcdir)/wslua_dumper.c \
-	$(srcdir)/wslua_internals.c
+	lua_bitop.c \
+	lrexlib.c \
+	lrexlib_glib.c \
+	lrexlib_glib_f.c \
+	wslua_tvb.c \
+	wslua_proto.c \
+	wslua_int64.c \
+	wslua_tree.c \
+	wslua_pinfo.c \
+	wslua_listener.c \
+	wslua_gui.c \
+	wslua_dir.c \
+	wslua_util.c \
+	wslua_field.c \
+	wslua_file.c \
+	wslua_struct.c \
+	wslua_dumper.c \
+	wslua_internals.c
 
 libwslua_la_SOURCES = \
 	$(wslua_modules) \
@@ -114,7 +114,7 @@ wslua.h: declare_wslua.h
 register_wslua.c: declare_wslua.h
 
 declare_wslua.h: make-reg.pl $(wslua_modules) taps_wslua.c
-	$(PERL) $(srcdir)/make-reg.pl $(wslua_modules);
+	$(PERL) $(srcdir)/make-reg.pl -d $(srcdir) $(wslua_modules)
 
 init.lua: template-init.lua make-init-lua.pl $(top_srcdir)/epan/ftypes/ftypes.h $(top_srcdir)/wiretap/wtap.h  $(top_srcdir)/epan/proto.h $(top_srcdir)/epan/stat_groups.h
 	$(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua
diff --git a/epan/wslua/make-reg.pl b/epan/wslua/make-reg.pl
index 52af54c817..683ceaf5c1 100755
--- a/epan/wslua/make-reg.pl
+++ b/epan/wslua/make-reg.pl
@@ -8,29 +8,44 @@
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+use Getopt::Long;
 
 my @classes = ();
 my @functions = ();
+my $source_dir = "";
+
+GetOptions('dir=s' => \$source_dir);
+
+my $filename;
+while ($filename = $ARGV[0]) {
+	shift;
+
+	if ($source_dir and ! -e $filename) {
+		$filename = $source_dir . '/' . $filename;
+	}
+
+	open FILE, $filename or warn "Couldn't open file $filename: $!";
 
-while (<>) {
-	push @classes, $1 if /WSLUA_CLASS_DEFINE(?:_BASE)?\050\s*([A-Za-z0-9]+)/;
-	push @functions, $1 if  /WSLUA_FUNCTION\s+wslua_([a-z_0-9]+)/;
+	while (<FILE>) {
+		push @classes, $1 if /WSLUA_CLASS_DEFINE(?:_BASE)?\050\s*([A-Za-z0-9]+)/;
+		push @functions, $1 if /WSLUA_FUNCTION\s+wslua_([a-z_0-9]+)/;
+	}
 }
 
 open C, ">register_wslua.c";
@@ -39,19 +54,19 @@ open H, ">declare_wslua.h";
 print H "/* This file is automatically generated by make-reg.pl; do not edit! */\n\n";
 print C "/* This file is automatically generated by make-reg.pl; do not edit! */\n\n";
 
-print H "#define WSLUA_DECLARE_CLASSES() \\\n"; 
+print H "#define WSLUA_DECLARE_CLASSES() \\\n";
 for (@classes) {
 	print H "\tWSLUA_CLASS_DECLARE($_);\\\n"
 }
 print H "\n\n";
 
-print H "#define WSLUA_DECLARE_FUNCTIONS() \\\n"; 
+print H "#define WSLUA_DECLARE_FUNCTIONS() \\\n";
 for (@functions) {
 	print H "\tWSLUA_FUNCTION wslua_$_(lua_State* L);\\\n"
 }
 print H "\n\n";
-print H "extern void wslua_register_classes(lua_State* L);\n"; 
-print H "extern void wslua_register_functions(lua_State* L);\n"; 
+print H "extern void wslua_register_classes(lua_State* L);\n";
+print H "extern void wslua_register_functions(lua_State* L);\n";
 print H "\n\n";
 
 print C '#include "config.h"' . "\n";
@@ -59,15 +74,15 @@ print C '#include "config.h"' . "\n";
 print C '#include "wslua.h"' . "\n\n";
 print C '#include "lua_bitop.h"' . "\n\n";
 
-print C "static void wslua_reg_module(lua_State* L, const char *name _U_, lua_CFunction func) { \n"; 
+print C "static void wslua_reg_module(lua_State* L, const char *name _U_, lua_CFunction func) { \n";
 print C "\tlua_pushcfunction(L, func);\n";
-# why was this done?  this string was never used for anything - I'll keep the argument "name" above 
+# why was this done?  this string was never used for anything - I'll keep the argument "name" above
 # just in case this needs to be reverted someday, but I think this thing's from old code or something
 # print C "\tlua_pushstring(L, name);\n";
 # print C "\tlua_call(L, 1, 0);\n";
 print C "\tlua_call(L, 0, 0);\n";
 print C "}\n\n";
-print C "void wslua_register_classes(lua_State* L) { \n"; 
+print C "void wslua_register_classes(lua_State* L) { \n";
 for (@classes) {
 	print C "\twslua_reg_module(L, \"${_}\", ${_}_register);\n";
 }
@@ -78,7 +93,7 @@ print C "\twslua_reg_module(L, \"GRegex\", luaopen_rex_glib);\n";
 print C "}\n\n";
 
 
-print C "void wslua_register_functions(lua_State* L) {\n"; 
+print C "void wslua_register_functions(lua_State* L) {\n";
 for (@functions) {
 	print C "\tWSLUA_REGISTER_FUNCTION($_); \n"
 }