Move the list of source files to a Makefile.common file.

Don't put $(srcdir)/ at the beginning of those file names - other
Makefile.am files don't have it, and it appears to break "make
distcheck", at least on my Mac OS X 10.4 machine.

svn path=/trunk/; revision=22439

3 files changed, 39 insertions, 24 deletions

diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 8784ffa09c..f40f1f7ff5 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -18,7 +18,7 @@
 # 
 # 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
 if HAVE_WARNINGS_AS_ERRORS
@@ -29,19 +29,8 @@ INCLUDES = -I$(top_srcdir) @LUA_INCLUDES@
 
 noinst_LTLIBRARIES = libwslua.la
 
-wslua_modules = 	\
-	$(srcdir)/wslua_tvb.c \
-	$(srcdir)/wslua_proto.c \
-	$(srcdir)/wslua_tree.c \
-	$(srcdir)/wslua_pinfo.c \
-	$(srcdir)/wslua_listener.c \
-	$(srcdir)/wslua_gui.c \
-	$(srcdir)/wslua_util.c \
-	$(srcdir)/wslua_field.c \
-	$(srcdir)/wslua_dumper.c
-
 libwslua_la_SOURCES = \
-	$(wslua_modules) \
+	$(MODULES) \
 	taps_wslua.c \
 	register_wslua.c \
 	init_wslua.c \
@@ -81,6 +70,7 @@ EXTRA_DIST = \
 	template-init.lua \
 	make-init-lua.pl \
 	make-taps.pl \
+	Makefile.common \
 	Makefile.nmake
 
 taps_used = \
diff --git a/epan/wslua/Makefile.common b/epan/wslua/Makefile.common
new file mode 100644
index 0000000000..057acda187
--- /dev/null
+++ b/epan/wslua/Makefile.common
@@ -0,0 +1,36 @@
+# Makefile.common
+#     Contains the stuff from Makefile.am and Makefile.nmake that is
+#     a) common to both files and
+#     b) portable between both files
+#
+# $Id$
+#
+# 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
+#
+
+MODULES = 	\
+	wslua_tvb.c \
+	wslua_proto.c \
+	wslua_tree.c \
+	wslua_pinfo.c \
+	wslua_listener.c \
+	wslua_gui.c \
+	wslua_util.c \
+	wslua_field.c \
+	wslua_dumper.c
diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index fbbd6d11b0..0b515c92b7 100644
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -14,17 +14,6 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 .c.obj::
    $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-MODULES = 	\
-	wslua_tvb.c \
-	wslua_proto.c \
-	wslua_tree.c \
-	wslua_pinfo.c \
-	wslua_listener.c \
-	wslua_gui.c \
-	wslua_util.c \
-	wslua_field.c \
-	wslua_dumper.c
-
 OBJECTS= \
 	init_wslua.obj \
 	register_wslua.obj \