merge with 0.30.213

[util-vserver.git] / python / Makefile

diff --git a/python/Makefile b/python/Makefile
index 32d624a..36c4411 100644 (file)
--- a/python/Makefile
+++ b/python/Makefile
@@ -1,15 +1,36 @@
+#
+# GNUMakefile for util-vserver Python bindings
+#
+# Steve Muir <smuir@cs.princeton.edu>
+# Mark Huang <mlhuang@cs.princeton.edu>
+# Copyright (C) 2005 The Trustees of Princeton University
+#
+# $Id: Makefile,v 1.13 2007/06/29 19:02:15 dhozac Exp $
+#
+
 INCLUDES := -I.. -I../lib
 LIBS = -L../lib -lvserver
 
-PY_MODS := vserver.py
-PY_EXT_MODS := vduimpl.so vserverimpl.so
+PY_MODS := vserver.py cpulimit.py bwlimit.py
+PY_EXT_MODS := vserverimpl.so
+
+LT_LINK = ../libtool --tag=CC --mode=link
+
+
 
 all: py-build
 
+# XXX - compatibility with util-vserver specfile
+INSTALL_ROOT ?= $(DESTDIR)
+
 install: py-install
-       ln -s /usr/lib/util-vserver/util-vserver-vars \
-       $(INSTALL_ROOT)/usr/lib/python2.3/site-packages/util_vserver_vars.py
 
--include pybuild.mk
+clean: py-clean
+
+
+
+UTIL_PYTHON ?= $(wildcard ../../util-python*)
+
+include $(UTIL_PYTHON)/pybuild.mk
 
-.PHONY: all install
+.PHONY: all install clean