From 5e74ca4427cc363bf43308fb00cf7f7d141b0f30 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 27 Sep 2007 14:38:48 -0400 Subject: make "make clean" go into the subdirs and run makeclean there as well --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 928adeb..63408b8 100755 --- a/Makefile +++ b/Makefile @@ -4,6 +4,8 @@ NEWRELEASE = $(shell echo $$(($(RELEASE) + 1))) MESSAGESPOT=po/messages.pot +DIRS = modules minion overlord func docs + all: rpms clean: @@ -12,6 +14,7 @@ clean: -rm -rf *~ -rm -rf rpm-build/ -rm -rf docs/*.gz + -for d in $(DIRS); do ($(MAKE) -C $$d clean ); done clean_hard: -rm -rf $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/func @@ -57,6 +60,7 @@ restart: recombuild: install_harder restart + clean_rpms: -rpm -e func -- cgit From 6d43e053d75e4a08a05cea84ffa266fdd8e81ddc Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 27 Sep 2007 14:39:08 -0400 Subject: add util makefiles here --- docs/Makefile | 7 +++++++ func/Makefile | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100755 docs/Makefile create mode 100755 func/Makefile diff --git a/docs/Makefile b/docs/Makefile new file mode 100755 index 0000000..ede53b5 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,7 @@ + + +clean:: + @rm -fv *.pyc *~ .*~ *.pyo + @find . -name .\#\* -exec rm -fv {} \; + @rm -fv *.rpm + @rm -fv *.gz diff --git a/func/Makefile b/func/Makefile new file mode 100755 index 0000000..86a3db8 --- /dev/null +++ b/func/Makefile @@ -0,0 +1,19 @@ + + +PYFILES = $(wildcard *.py) + +PYCHECKER = /usr/bin/pychecker +PYFLAKES = /usr/bin/pyflakes + +clean:: + @rm -fv *.pyc *~ .*~ *.pyo + @find . -name .\#\* -exec rm -fv {} \; + @rm -fv *.rpm + + +pychecker:: + @$(PYCHECKER) $(PYFILES) || exit 0 + +pyflakes:: + @$(PYFLAKES) $(PYFILES) || exit 0 + -- cgit From 59f78b9bd14862536a81b37b0534ee15984f873a Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 27 Sep 2007 14:48:43 -0400 Subject: top level targs for "pyflakes" and "pychecker" just for kicks --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 63408b8..789c591 100755 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ NEWRELEASE = $(shell echo $$(($(RELEASE) + 1))) MESSAGESPOT=po/messages.pot DIRS = modules minion overlord func docs +PYDIRS = modules minion overlord func all: rpms @@ -74,6 +75,10 @@ sdist: messages new-rpms: bumprelease rpms +pychecker: + -for d in $(PYDIRS); do ($(MAKE) -C $$d pychecker ); done +pyflakes: + -for d in $(PYDIRS); do ($(MAKE) -C $$d pyflakes ); done rpms: build manpage sdist mkdir -p rpm-build -- cgit From a2b89a5d64b632759c76ab7f90d4f7879d7acb42 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 27 Sep 2007 15:02:45 -0400 Subject: just some prettyifying --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 789c591..2837eac 100755 --- a/Makefile +++ b/Makefile @@ -25,8 +25,7 @@ clean_harder: -rm -rf /etc/func -rm -rf /var/lib/func -clean_hardest: - -rpm -e func +clean_hardest: clean_rpms manpage: pod2man --center="funcd" --release="" ./docs/funcd.pod | gzip -c > ./docs/funcd.1.gz @@ -54,22 +53,20 @@ install_hard: clean_hard install install_harder: clean_harder install +install_hardest: clean_harder clean_rpms rpms install_rpm restart + +install_rpm: + -rpm -Uvh rpm-build/func-$(VERSION)-$(RELEASE)$(shell rpm -E "%{?dist}").noarch.rpm + restart: -/etc/init.d/certmaster restart -/etc/init.d/funcd restart - recombuild: install_harder restart - clean_rpms: -rpm -e func -install_rpm: - -rpm -Uvh rpm-build/func-$(VERSION)-$(RELEASE)$(shell rpm -E "%{?dist}").noarch.rpm - -install_hardest: clean_harder clean_rpms rpms install_rpm restart - sdist: messages python setup.py sdist -- cgit