aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wslua
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2007-08-02 08:24:00 +0000
committerGuy Harris <guy@alum.mit.edu>2007-08-02 08:24:00 +0000
commitad76a231d4880c766c8236774ed8115afee5ba5e (patch)
tree790e412c8d09b613e5ab709bb3343c90cea808d4 /epan/wslua
parent4f00d5fcc1fa792e573160e728c22a7484f80f32 (diff)
We have to include Makefile.common if we move definitions we need
there.... svn path=/trunk/; revision=22440
Diffstat (limited to 'epan/wslua')
-rw-r--r--epan/wslua/Makefile.am2
-rw-r--r--epan/wslua/Makefile.nmake2
2 files changed, 3 insertions, 1 deletions
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index f40f1f7ff5..9454aaf06a 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -21,6 +21,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#
+include Makefile.common
+
if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index 0b515c92b7..a896c1fc13 100644
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -4,7 +4,7 @@
include ..\..\config.nmake
-############### no need to modify below this line #########
+include Makefile.common
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) $(LUA_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)