Don't generate mod[perl|python].tar.bz2

znc · Aug 13, 2012 · 7a4aa74 · 7a4aa74
1 parent fcc7839
commit 7a4aa74
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 44 deletions.
diff --git a/modules/modperl/Makefile.gen b/modules/modperl/Makefile.gen
@@ -15,26 +15,23 @@ E=@\#
 C=
 endif
 
-modperl/modperl.tar.bz2: modperl/gen/ZNC.cpp modperl/gen/ZNC.pm modperl/gen/functions.cpp modperl/gen/swigperlrun.h
-	$(E) Packing modperl files...
-	$(Q)tar -cjf $@ -C modperl/gen ZNC.cpp ZNC.pm functions.cpp swigperlrun.h
+.SECONDARY:
 
-modperl/gen/swigperlrun.h:
-	@mkdir -p modperl/gen
+all: modperl/ZNC.cpp modperl/ZNC.pm modperl/functions.cpp modperl/swigperlrun.h
+
+modperl/swigperlrun.h:
+	@mkdir -p modperl
 	$(Q)$(SWIG) -perl5 -c++ -shadow -external-runtime $@
 
-modperl/gen/ZNC.cpp: modperl/modperl.i modperl/module.h modperl/CString.i
+modperl/ZNC.cpp: modperl/modperl.i modperl/module.h modperl/CString.i
 	$(E) Generating ZNC API for Perl...
-	@mkdir -p modperl/gen
-	$(Q)$(SWIG) -perl5 -c++ -shadow -outdir modperl/gen -I$(srcdir) -MD -MF .depend/modperl.swig.dep -w362,315,401,402 -o $@ $<
-	$(Q)$(SED) 's#^modperl/gen/ZNC.cpp:#modperl/modperl.tar.bz2:#' .depend/modperl.swig.dep > .depend/modperl.tar.dep
+	@mkdir -p modperl
+	$(Q)$(SWIG) -perl5 -c++ -shadow -outdir modperl -I$(srcdir) -MD -MF .depend/modperl.swig.dep -w362,315,401,402 -o $@ $<
 
-modperl/gen/ZNC.pm: modperl/gen/ZNC.cpp
+modperl/ZNC.pm: modperl/ZNC.cpp
 
-modperl/gen/functions.cpp: modperl/codegen.pl modperl/functions.in
+modperl/functions.cpp: modperl/codegen.pl modperl/functions.in
 	@mkdir -p modperl
 	$(Q)$(PERL) $^ $@
 
-all: modperl/modperl.tar.bz2
-
 -include .depend/modperl.swig.dep
diff --git a/modules/modperl/Makefile.inc b/modules/modperl/Makefile.inc
@@ -39,15 +39,9 @@ modperl/ZNC.o: modperl/ZNC.cpp Makefile
 	$(E) Building ZNC Perl bindings library...
 	$(Q)$(CXX) $(MODFLAGS) -I$(srcdir) -MD -MF .depend/modperl.library.dep $(PERL_CXX) -Wno-unused-variable -Wno-shadow -o $@ $< -c
 
-modperl/swigperlrun.h modperl/functions.cpp modperl/ZNC.cpp modperl/ZNC.pm: modperl/modperl.tar.bz2
-	@mkdir -p modperl
-	$(E) Unpacking modperl files...
-	$(Q)tar -xf $^ -C modperl
-	$(Q)touch modperl/swigperlrun.h modperl/functions.cpp modperl/ZNC.cpp modperl/ZNC.pm
-
 ifneq "$(SWIG)" ""
-modperl/modperl.tar.bz2: modperl/codegen.pl modperl/functions.in Makefile
-	@mkdir -p modperl .depend
+modperl/swigperlrun.h modperl/functions.cpp modperl/ZNC.cpp modperl/ZNC.pm: modperl/codegen.pl modperl/functions.in Makefile
+	@mkdir -p modperl
 	$(Q)$(MAKE) -f $(srcdir)/modperl/Makefile.gen $(C) SWIG="$(SWIG)" srcdir="$(srcdir)" PERL="$(PERL)" VERBOSE="$(VERBOSE)" SED="$(SED)"
 endif
 

diff --git a/modules/modpython/Makefile.gen b/modules/modpython/Makefile.gen
@@ -15,26 +15,23 @@ E=@\#
 C=
 endif
 
-modpython/modpython.tar.bz2: modpython/gen/_znc_core.cpp modpython/gen/znc_core.py modpython/gen/functions.cpp modpython/gen/swigpyrun.h
-	$(E) Packing modpython files...
-	$(Q)tar -cjf $@ -C modpython/gen _znc_core.cpp znc_core.py functions.cpp swigpyrun.h
+.SECONDARY:
 
-modpython/gen/swigpyrun.h:
-	@mkdir -p modpython/gen
+all: modpython/_znc_core.cpp modpython/znc_core.py modpython/functions.cpp modpython/swigpyrun.h
+
+modpython/swigpyrun.h:
+	@mkdir -p modpython
 	$(Q)$(SWIG) -python -py3 -c++ -shadow -external-runtime $@
 
-modpython/gen/_znc_core.cpp: modpython/modpython.i modpython/module.h modpython/cstring.i
+modpython/_znc_core.cpp: modpython/modpython.i modpython/module.h modpython/cstring.i
 	$(E) Generating ZNC API for python...
-	@mkdir -p modpython/gen
-	$(Q)$(SWIG) -python -py3 -c++ -shadow -outdir modpython/gen -I$(srcdir) -MD -MF .depend/modpython.swig.dep -w362,315,401 -o $@ $<
-	$(Q)$(SED) 's#^modpython/gen/_znc_core.cpp:#modpython/modpython.tar.bz2:#' .depend/modpython.swig.dep > .depend/modpython.tar.dep
+	@mkdir -p modpython
+	$(Q)$(SWIG) -python -py3 -c++ -shadow -outdir modpython -I$(srcdir) -MD -MF .depend/modpython.swig.dep -w362,315,401 -o $@ $<
 
-modpython/gen/znc_core.py: modpython/gen/_znc_core.cpp
+modpython/znc_core.py: modpython/_znc_core.cpp
 
-modpython/gen/functions.cpp: modpython/codegen.pl modpython/functions.in
+modpython/functions.cpp: modpython/codegen.pl modpython/functions.in
 	@mkdir -p modpython
 	$(Q)$(PERL) $^ $@
 
-all: modpython/modpython.tar.bz2
-
 -include .depend/modpython.swig.dep
diff --git a/modules/modpython/Makefile.inc b/modules/modpython/Makefile.inc
@@ -25,9 +25,6 @@ endif
 
 .PHONY: modpython_install modpython_all
 
-# otherwise make doesn't see it even when it exists and wants to create it several times
-.SECONDARY: modpython/znc_core.py
-
 install: $(PYTHONHOOK)
 
 # This will run: modpython/compiler blah.py blah.pyc
@@ -41,12 +38,6 @@ endif
 modpython_all: modpython/_znc_core.so modpython/znc.pyc modpython/znc_core.pyc
 modpython_all: $(addsuffix c, $(notdir $(wildcard $(srcdir)/*.py)))
 
-modpython/znc_core.py modpython/_znc_core.cpp modpython/functions.cpp modpython/swigpyrun.h: modpython/modpython.tar.bz2
-	@mkdir -p modpython
-	$(E) Unpacking modpython files...
-	$(Q)tar -xf $^ -C modpython
-	$(Q)touch modpython/swigpyrun.h modpython/functions.cpp modpython/_znc_core.cpp modpython/znc_core.py
-
 modpython/_znc_core.o: modpython/_znc_core.cpp Makefile
 	@mkdir -p modpython
 	@mkdir -p .depend
@@ -58,7 +49,7 @@ modpython/_znc_core.so: modpython/_znc_core.o Makefile
 	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PY_LDFLAGS)
 
 ifneq "$(SWIG)" ""
-modpython/modpython.tar.bz2: modpython/codegen.pl modpython/functions.in Makefile
+modpython/znc_core.py modpython/_znc_core.cpp modpython/functions.cpp modpython/swigpyrun.h: modpython/codegen.pl modpython/functions.in Makefile
 	@mkdir -p modpython .depend
 	$(Q)$(MAKE) -f $(srcdir)/modpython/Makefile.gen $(C) SWIG="$(SWIG)" srcdir="$(srcdir)" PERL="$(PERL)" VERBOSE="$(VERBOSE)" SED="$(SED)"
 endif