forked from osmocom/wireshark
Gak. <> makes it too easy to make these make- scripts do what the rest
do, and take $(srcdir) as the first argument. Back the previous changes out, for now. svn path=/trunk/; revision=22441
This commit is contained in:
parent
ad76a231d4
commit
dd86332046
|
@ -18,11 +18,9 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#
|
#
|
||||||
|
|
||||||
include Makefile.common
|
|
||||||
|
|
||||||
if HAVE_WARNINGS_AS_ERRORS
|
if HAVE_WARNINGS_AS_ERRORS
|
||||||
AM_CFLAGS = -Werror
|
AM_CFLAGS = -Werror
|
||||||
endif
|
endif
|
||||||
|
@ -31,8 +29,19 @@ INCLUDES = -I$(top_srcdir) @LUA_INCLUDES@
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libwslua.la
|
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 = \
|
libwslua_la_SOURCES = \
|
||||||
$(MODULES) \
|
$(wslua_modules) \
|
||||||
taps_wslua.c \
|
taps_wslua.c \
|
||||||
register_wslua.c \
|
register_wslua.c \
|
||||||
init_wslua.c \
|
init_wslua.c \
|
||||||
|
@ -72,7 +81,6 @@ EXTRA_DIST = \
|
||||||
template-init.lua \
|
template-init.lua \
|
||||||
make-init-lua.pl \
|
make-init-lua.pl \
|
||||||
make-taps.pl \
|
make-taps.pl \
|
||||||
Makefile.common \
|
|
||||||
Makefile.nmake
|
Makefile.nmake
|
||||||
|
|
||||||
taps_used = \
|
taps_used = \
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
# 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
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
|
||||||
include Makefile.common
|
############### no need to modify below this line #########
|
||||||
|
|
||||||
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(LUA_CFLAGS) \
|
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(LUA_CFLAGS) \
|
||||||
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
|
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
|
||||||
|
@ -14,6 +14,17 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
|
||||||
.c.obj::
|
.c.obj::
|
||||||
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
|
$(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= \
|
OBJECTS= \
|
||||||
init_wslua.obj \
|
init_wslua.obj \
|
||||||
register_wslua.obj \
|
register_wslua.obj \
|
||||||
|
|
Loading…
Reference in New Issue