From 6b396fca7f25e5365f98565498eada03f4dce75c Mon Sep 17 00:00:00 2001
From: darthgandalf <darthgandalf@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 15 Jan 2011 21:04:25 +0000
Subject: [PATCH] Fix for last commit. Also remove perl magic from
 modperl/Makefile.inc which was used to suppress a warning.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2269 726aef4b-f618-498e-8847-2d620e286838
---
 modules/modperl/Makefile.inc   | 8 ++++----
 modules/modpython/Makefile.inc | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/modperl/Makefile.inc b/modules/modperl/Makefile.inc
index bbc8a73e..7831c2ba 100644
--- a/modules/modperl/Makefile.inc
+++ b/modules/modperl/Makefile.inc
@@ -26,8 +26,9 @@ install: $(PERLHOOK)
 modperl.so: modperl/ZNC.so modperl/swigperlrun.h
 modperl/ZNC.so: modperl/ZNC.cpp Makefile modperl/functions.cpp
 	@mkdir -p modperl
+	@mkdir -p .depend
 	$(E) Building ZNC Perl bindings library...
-	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -I$(srcdir) -MMD -MF .depend/modperl.library.dep $(PERLCOMMON) -o $@ $<
+	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -I$(srcdir) -MMD -MF .depend/modperl.library.dep $(PERLCOMMON) -Wno-unused-variable -o $@ $<
 ifneq "$(SWIG)" ""
 modperl/swigperlrun.h:
 	@mkdir -p modperl
@@ -35,9 +36,8 @@ modperl/swigperlrun.h:
 modperl/ZNC.cpp: modperl/modperl.i Makefile modperl/module.h modperl/CString.i
 	$(E) Generating ZNC API for Perl...
 	@mkdir -p modperl
-	$(Q)$(SWIG) -perl5 -c++ -shadow -outdir modperl -I$(srcdir) -MMD -MF .depend/modperl.swig.dep -w362,315,401,402 -o $@.warn $<
-	$(Q)$(PERL) -pe '$$x==2 and print "items+=0;" and $$x=3;/^XS\(SWIG_init\)/ and $$x=1;$$x==1 and /dXSARGS/ and $$x=2' $@.warn > $@
-	$(Q)rm -rf $@.warn
+	@mkdir -p .depend
+	$(Q)$(SWIG) -perl5 -c++ -shadow -outdir modperl -I$(srcdir) -MMD -MF .depend/modperl.swig.dep -w362,315,401,402 -o $@ $<
 endif
 modperl/functions.cpp: modperl/functions.in
 	@mkdir -p modperl
diff --git a/modules/modpython/Makefile.inc b/modules/modpython/Makefile.inc
index 4a8eac90..646c3e9a 100644
--- a/modules/modpython/Makefile.inc
+++ b/modules/modpython/Makefile.inc
@@ -37,6 +37,7 @@ modpython_all: $(addsuffix c, $(notdir $(wildcard $(srcdir)/*.py)))
 modpython/znc_core.py: modpython/_znc_core.so
 modpython/_znc_core.so: modpython/_znc_core.cpp Makefile modpython/functions.cpp
 	@mkdir -p modpython
+	@mkdir -p .depend
 	$(E) Building ZNC python bindings library...
 	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -I$(srcdir) -MMD -MF .depend/modpython.library.dep $(PYTHONCOMMON) -o $@ $<
 ifneq "$(SWIG)" ""
@@ -46,6 +47,7 @@ modpython/swigpyrun.h:
 modpython/_znc_core.cpp: modpython/modpython.i Makefile
 	$(E) Generating ZNC API for python...
 	@mkdir -p modpython
+	@mkdir -p .depend
 	$(Q)$(SWIG) -python -py3 -c++ -shadow -outdir modpython -I$(srcdir) -MMD -MF .depend/modpython.swig.dep -w362,315,401 -o $@ $<
 endif
 modpython/functions.cpp: modpython/functions.in