mirror of
https://github.com/znc/znc.git
synced 2026-07-04 17:01:23 +02:00
Fuck those makefiles
It tries to run SWIG for modpython several times simultaneously. Just force modules to be built in 1 thread for now if modpython is going to be built. Makefiles should be thrown away. Also don't show warning about unused perl, fix #219
This commit is contained in:
+8
-2
@@ -58,6 +58,12 @@ E=@\#
|
||||
C=
|
||||
endif
|
||||
|
||||
ifeq "@PYTHON@" ""
|
||||
JOBHACK=
|
||||
else
|
||||
JOBHACK=-j1
|
||||
endif
|
||||
|
||||
.PHONY: all man modules clean distclean install version_extra_recompile
|
||||
.SECONDARY:
|
||||
|
||||
@@ -86,7 +92,7 @@ man:
|
||||
@$(MAKE) -C man $(C)
|
||||
|
||||
modules: $(LIBZNC)
|
||||
@$(MAKE) -C modules $(C)
|
||||
@$(MAKE) -C modules $(C) $(JOBHACK)
|
||||
|
||||
clean:
|
||||
rm -rf $(CLEAN)
|
||||
@@ -125,7 +131,7 @@ install: znc $(LIBZNC)
|
||||
$(INSTALL_DATA) $(srcdir)/include/znc/*.h $(DESTDIR)$(includedir)/znc
|
||||
$(INSTALL_DATA) include/znc/zncconfig.h $(DESTDIR)$(includedir)/znc
|
||||
$(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
|
||||
@$(MAKE) -C modules install DESTDIR=$(DESTDIR);
|
||||
@$(MAKE) -C modules $(JOBHACK) install DESTDIR=$(DESTDIR);
|
||||
if test -n "$(LIBZNC)"; then \
|
||||
test -d $(DESTDIR)$(LIBZNCDIR) || $(INSTALL) -d $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
|
||||
$(INSTALL_PROGRAM) $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
|
||||
|
||||
@@ -9,7 +9,7 @@ PERL_CXX += -Wno-write-strings -Wno-redundant-decls -Wno-missing-declarations
|
||||
PERL_CXX += -Wno-type-limits -Wno-sign-compare -Wno-strict-overflow
|
||||
# This is for SWIG
|
||||
PERL_CXX += -DSWIG_TYPE_TABLE=znc
|
||||
modperlCXXFLAGS := $(PERL_CXX)
|
||||
modperlCXXFLAGS := $(PERL_CXX) -Wno-unused-function
|
||||
modperlLDFLAGS := $(PERL_LD)
|
||||
# Find additional headers for out-of-tree build
|
||||
modperlCXXFLAGS += -I.
|
||||
@@ -32,7 +32,7 @@ else
|
||||
FILES := $(shell echo $(FILES) | sed -e "s/modperl//")
|
||||
endif
|
||||
|
||||
.PHONY: modperl_install
|
||||
.PHONY: modperl_install modperl_all
|
||||
|
||||
install: $(PERLHOOK)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user