Fix make clean for modperl and modpython

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2220 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
darthgandalf
2010-12-30 19:18:24 +00:00
parent ece2c885da
commit afa16df2bc
3 changed files with 12 additions and 8 deletions

View File

@@ -53,6 +53,8 @@ ifneq "$(LIBZNC)" ""
LDFLAGS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR) LDFLAGS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR)
endif endif
CLEAN :=
FILES := $(notdir $(wildcard $(srcdir)/*.cpp)) FILES := $(notdir $(wildcard $(srcdir)/*.cpp))
# If extra is enabled # If extra is enabled
ifeq "@EXTRA@" "yes" ifeq "@EXTRA@" "yes"
@@ -85,7 +87,7 @@ charsetFLAGS := @LIBICONV@
TARGETS := $(addsuffix .so, $(FILES)) TARGETS := $(addsuffix .so, $(FILES))
CLEAN := *.so extra/*.so CLEAN += *.so extra/*.so
.PHONY: all clean install install_metadirs create_install_dir uninstall .PHONY: all clean install install_metadirs create_install_dir uninstall

View File

@@ -8,14 +8,15 @@ PERLCOMMON += -DSWIG_TYPE_TABLE=znc
modperlFLAGS := $(PERLCOMMON) modperlFLAGS := $(PERLCOMMON)
# Find additional headers for out-of-tree build # Find additional headers for out-of-tree build
modperlFLAGS += -I. modperlFLAGS += -I.
PERLHOOK := modperl_install PERLHOOK := modperl_install
CLEAN += modperl/ZNC.so modperl/ZNC.pm
CLEAN += modperl/swigperlrun.h modperl/ZNC.cpp modperl/functions.cpp
else else
FILES := $(shell echo $(FILES) | sed -e "s/modperl//") FILES := $(shell echo $(FILES) | sed -e "s/modperl//")
endif endif
CLEAN += modperl/ZNC.so modperl/ZNC.pm
CLEAN += modperl/swigperlrun.h modperl/ZNC.cpp modperl/functions.cpp
.PHONY: modperl_install .PHONY: modperl_install
install: $(PERLHOOK) install: $(PERLHOOK)

View File

@@ -4,11 +4,8 @@ PYTHONCOMMON += -DSWIG_TYPE_TABLE=znc
PYTHONCOMMON += -Wno-missing-field-initializers -Wno-unused -Wno-shadow PYTHONCOMMON += -Wno-missing-field-initializers -Wno-unused -Wno-shadow
PYTHONCOMMON += -Wno-missing-declarations -Wno-uninitialized PYTHONCOMMON += -Wno-missing-declarations -Wno-uninitialized
modpythonFLAGS := $(PYTHONCOMMON) -I. modpythonFLAGS := $(PYTHONCOMMON) -I.
PYTHONHOOK := modpython_install
else
FILES := $(shell echo $(FILES) | sed -e "s/modpython//")
endif
PYTHONHOOK := modpython_install
CLEAN += modpython/_znc_core.so modpython/_znc_core.cpp modpython/znc_core.py modpython/znc_core.pyc CLEAN += modpython/_znc_core.so modpython/_znc_core.cpp modpython/znc_core.py modpython/znc_core.pyc
CLEAN += modpython/swigpyrun.h modpython/znc.pyc modpython/functions.cpp modpython/compiler CLEAN += modpython/swigpyrun.h modpython/znc.pyc modpython/functions.cpp modpython/compiler
ifneq "$(srcdir)" "." ifneq "$(srcdir)" "."
@@ -16,6 +13,10 @@ ifneq "$(srcdir)" "."
CLEAN += modpython/znc.py CLEAN += modpython/znc.py
endif endif
else
FILES := $(shell echo $(FILES) | sed -e "s/modpython//")
endif
.PHONY: modpython_install modpython_compilepyc .PHONY: modpython_install modpython_compilepyc
install: $(PYTHONHOOK) install: $(PYTHONHOOK)