Mon Jun 11 14:49:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

	* docs/examples/index.py: Autogenerate Makefile.am and
	  .cvsignore in this directory with corrected LDADDS and
	  including some generated subdirectories which CVS should
	  ignore.

diff --git a/ChangeLog b/ChangeLog
index fd5e6ad3fc501ddc695be6069f88f1f9cf31bc23..e4daeb5a3aa9c8b7eb808d7d6a4c9a9f26a66cf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 11 14:49:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * docs/examples/index.py: Autogenerate Makefile.am and
+         .cvsignore in this directory with corrected LDADDS and
+         including some generated subdirectories which CVS should
+         ignore.
+
 Mon Jun 11 14:10:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * libvirt.spec.in: BuildRequires gnutls-devel and

diff --git a/docs/examples/.cvsignore b/docs/examples/.cvsignore
index a854064512c8ca9f885572466588ef02fc08dc96..aa743cb715d91806a95b6f1ccab8638f2a23350b 100644 (file)
--- a/docs/examples/.cvsignore
+++ b/docs/examples/.cvsignore
@@ -1,7 +1,7 @@
 .memdump
 Makefile.in
 Makefile
-info1
-suspend
 .deps
-.libs
\ No newline at end of file
+.libs
+suspend
+info1

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 6da54d6d30d7bf1d94b5396869c58481dd7aab22..c62d128208357fab97250786fd1b160d1cae73c9 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -18,24 +18,24 @@ install-data-local:
 
 EXTRA_DIST=examples.xsl index.py examples.xml 
 
-noinst_PROGRAMS=info1 suspend 
-
-info1_SOURCES=info1.c
-info1_LDFLAGS=
-info1_DEPENDENCIES= $(DEPS)
-info1_LDADD= $(LDADDS)
+noinst_PROGRAMS=suspend info1 
 
 suspend_SOURCES=suspend.c
 suspend_LDFLAGS=
 suspend_DEPENDENCIES= $(DEPS)
 suspend_LDADD= $(LDADDS)
 
+info1_SOURCES=info1.c
+info1_LDFLAGS=
+info1_DEPENDENCIES= $(DEPS)
+info1_LDADD= $(LDADDS)
+
 valgrind: 
        $(MAKE) CHECKER='valgrind' tests
 
 tests: $(noinst_PROGRAMS)
        @(echo '## examples regression tests')
-       @($(CHECKER) ./info1)
        @($(CHECKER) ./suspend)
+       @($(CHECKER) ./info1)
 
 

diff --git a/docs/examples/index.py b/docs/examples/index.py
index 5f56f2f35d0acc18a0992262fd4d4c58b1ee55a8..2bc2b160ae99165154cac47b67c73ac1ccf0b22c 100755 (executable)
--- a/docs/examples/index.py
+++ b/docs/examples/index.py
@@ -224,7 +224,7 @@ def dump_Makefile():
 SUBDIRS=python
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include
 DEPS = $(top_builddir)/src/libvirt.la
-LDADDS = @STATIC_BINARIES@ $(top_builddir)/src/libvirt.la 
+LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la 
 
 rebuild: examples.xml index.html
 
@@ -272,6 +272,8 @@ install-data-local:
     ignore = """.memdump
 Makefile.in
 Makefile
+.deps
+.libs
 """
     for example in examples:
         ignore = ignore + "%s\n" % (example)