summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2007-06-26 13:47:04 +0000
committerRichard W.M. Jones <rjones@redhat.com>2007-06-26 13:47:04 +0000
commit4a0cef94a56a1fff2ca3f7deb48c0a1d0c963c5e (patch)
tree71f174bf403da922da34ceb615678d7e177f51e8 /python/Makefile.am
parentTue Jun 26 12:40:00 BST 2007 Richard W.M. Jones <rjones@redhat.com> (diff)
downloadlibvirt-4a0cef94a56a1fff2ca3f7deb48c0a1d0c963c5e.tar.gz
libvirt-4a0cef94a56a1fff2ca3f7deb48c0a1d0c963c5e.tar.bz2
libvirt-4a0cef94a56a1fff2ca3f7deb48c0a1d0c963c5e.zip
Tue Jun 26 14:40:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/remote_internal.c, python/Makefile.am: Python bindings fixed, and now building virConnect.getHostname and virConnect.getURI. Fixed a problem which stopped libvirt.py from being (re-)built. Rearranged python/Makefile.am to make it cleaner and clearer.
Diffstat (limited to 'python/Makefile.am')
-rw-r--r--python/Makefile.am32
1 files changed, 14 insertions, 18 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index dbb471d30..4f9761091 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -37,35 +37,31 @@ libvirtmod_la_LIBADD = $(mylibs)
# Python header files contain a redundant decl, hence:
libvirtmod_la_CFLAGS = -Wno-redundant-decls
-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
- cat $(srcdir)/libvir.py libvirtclass.py > libvirt.py
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pythondir)
- @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pythondir)
- $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
- @(for doc in $(DOCS) ; \
- do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
-
GENERATE = generator.py
API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-python-api.xml
-GENERATED= libvirt.py \
- libvirt-export.c \
+GENERATED= libvirt-export.c \
libvirtclass.txt \
libvirt-py.c \
libvirt-py.h \
libvirtclass.py
-CLEANFILES= $(GENERATED) gen_prog libvirt.py
-
-$(GENERATED): gen_prog
-
-gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
+$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
- touch gen_prog
+
+libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+ cat $(srcdir)/libvir.py libvirtclass.py > libvirt.py
$(libvirtmod_la_OBJECTS): $(GENERATED)
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(pythondir)
+ @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pythondir)
+ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
+ @(for doc in $(DOCS) ; \
+ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
+
+CLEANFILES= $(GENERATED) libvirt.py
+
else
all:
endif