diff --git a/.gitignore b/.gitignore index 2d364dcb250039c2076a74313ffbb5c1351beb08..d5a6cf52b11e87980c102fb8105db4fdb5765608 100644 --- a/.gitignore +++ b/.gitignore @@ -69,7 +69,7 @@ /docs/libvirt-refs.xml /docs/search.php /docs/todo.html.in -/examples/domain-events/events-c/event-test +/examples/object-events/event-test /examples/dominfo/info1 /examples/hellolibvirt/hellolibvirt /examples/openauth/openauth diff --git a/Makefile.am b/Makefile.am index 2cbf71ad99c492f6a03b368a7ca4538c8755d2c9..88c70734b904f38cc44b0ccb36b71005062be70a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ LCOV = lcov GENHTML = genhtml SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ - tests po examples/domain-events/events-c examples/hellolibvirt \ + tests po examples/object-events examples/hellolibvirt \ examples/dominfo examples/apparmor examples/xml/nwfilter \ examples/openauth examples/systemtap diff --git a/cfg.mk b/cfg.mk index fe760a9798e5aa36b9e931503f66b571c480b11d..9a0665061679406d75bbd02b57e2623708144652 100644 --- a/cfg.mk +++ b/cfg.mk @@ -963,7 +963,7 @@ exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \ exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/virutil\.c$$ exclude_file_name_regexp--sc_prohibit_asprintf = \ - ^(bootstrap.conf$$|src/util/virstring\.[ch]$$|examples/domain-events/events-c/event-test\.c$$|tests/vircgroupmock\.c$$) + ^(bootstrap.conf$$|src/util/virstring\.[ch]$$|tests/vircgroupmock\.c$$) exclude_file_name_regexp--sc_prohibit_strdup = \ ^(docs/|examples/|src/util/virstring\.c|tests/virnetserverclientmock.c$$) diff --git a/configure.ac b/configure.ac index bb9234957f9fc1663c3fb33dd920035f1e14270a..10ce184cf41a60ff5c543b6a6e19be8d9bcb86bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,7 +2554,7 @@ AC_CONFIG_FILES([\ tools/Makefile \ tests/Makefile \ examples/apparmor/Makefile \ - examples/domain-events/events-c/Makefile \ + examples/object-events/Makefile \ examples/dominfo/Makefile \ examples/openauth/Makefile \ examples/hellolibvirt/Makefile \ diff --git a/examples/domain-events/events-c/Makefile.am b/examples/object-events/Makefile.am similarity index 100% rename from examples/domain-events/events-c/Makefile.am rename to examples/object-events/Makefile.am diff --git a/examples/domain-events/events-c/event-test.c b/examples/object-events/event-test.c similarity index 100% rename from examples/domain-events/events-c/event-test.c rename to examples/object-events/event-test.c diff --git a/libvirt.spec.in b/libvirt.spec.in index f615c62b0660ae6fbbc04324702ea854780fc405..849ec80dbace2d470014eaf49994a072c8a3753e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1430,7 +1430,7 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in domain-events/events-c dominfo hellolibvirt openauth xml/nwfilter systemtap +for i in object-events dominfo hellolibvirt openauth xml/nwfilter systemtap do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -2132,7 +2132,7 @@ exit 0 %doc docs/*.html docs/html docs/*.gif %doc docs/libvirt-api.xml %doc examples/hellolibvirt -%doc examples/domain-events/events-c +%doc examples/object-events %doc examples/dominfo %doc examples/openauth %doc examples/xml