master - build: plugin askant in our build system

master - build: plugin askant in our build system

[Andrew Price]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=be871661c2a33b908cba9fda02a213b5a00a75e5
Commit:        be871661c2a33b908cba9fda02a213b5a00a75e5
Parent:        e3b3a209563ec7143d9b1813aff7616139ae0a32
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Aug 20 12:24:04 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Aug 20 12:28:31 2008 +0200

build: plugin askant in our build system

add contrib/askant/Makefile

remove lib and inc sections from setup.py and drive them
from askant/Makefile instead.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 contrib/askant/Makefile |   24 ++++++++++++++++++++++++
 contrib/askant/setup.py |    5 +----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/contrib/askant/Makefile b/contrib/askant/Makefile
new file mode 100644
index 0000000..cd80640
--- /dev/null
+++ b/contrib/askant/Makefile
@@ -0,0 +1,24 @@
+include ../../make/defines.mk
+
+all: build
+
+include $(OBJDIR)/make/clean.mk
+
+CFLAGS += -I$(SRCDIR)/gfs2/libgfs2
+CFLAGS += -I$(SRCDIR)/gfs2/include
+
+LDFLAGS += -L$(OBJDIR)/gfs2/libgfs2 -lgfs2
+
+build:
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./setup.py build
+
+install:
+	./setup.py install --root $(DESTDIR)
+
+uninstall:
+	@echo UNINSTALL TARGET UNSUPPORTED
+
+clean:
+	./setup.py clean
+	rm askant/*.pyc
+	rm -rf build
diff --git a/contrib/askant/setup.py b/contrib/askant/setup.py
index 78daff2..3c971bc 100755
--- a/contrib/askant/setup.py
+++ b/contrib/askant/setup.py
@@ -11,8 +11,5 @@ setup(name="askant",
 	  url="http://andrewprice.me.uk/projects/askant",
 	  packages = ['askant','askant.fs'],
 	  ext_modules = [Extension("askant.fs.gfs2",
-		  sources = ["fsplugins/gfs2/gfs2module.c","fsplugins/gfs2/gfs2.c"],
-		  libraries = ["gfs2"],
-		  include_dirs=['../gfs2/libgfs2', '../gfs2/include', '../make'],
-		  library_dirs=['../gfs2/libgfs2'])],
+		  sources = ["fsplugins/gfs2/gfs2module.c","fsplugins/gfs2/gfs2.c"])],
 	  scripts = ['scripts/askant'])