From: Andrea Bolognani Date: Wed, 22 May 2019 16:16:59 +0000 (+0200) Subject: examples: Group all C programs together X-Git-Tag: v5.5.0-rc1~369 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=571cb9db30ebd1aa515aae403dd621a6a3a0fa33;p=thirdparty%2Flibvirt.git examples: Group all C programs together All other examples are organized using the either the format/ or the format/category/ hierarchy already, and grouping all C programs together removes the last remaining outliers. Signed-off-by: Andrea Bolognani Acked-by: Michal Privoznik --- diff --git a/.gitignore b/.gitignore index c15263037d..727bfdb6ec 100644 --- a/.gitignore +++ b/.gitignore @@ -68,21 +68,21 @@ /docs/libvirt-refs.xml /docs/news.html.in /docs/todo.html.in -/examples/admin/client_close -/examples/admin/client_info -/examples/admin/client_limits -/examples/admin/list_clients -/examples/admin/list_servers -/examples/admin/logging -/examples/admin/threadpool_params -/examples/domain/dommigrate -/examples/domain/domtop -/examples/domain/info1 -/examples/domain/rename -/examples/domain/suspend -/examples/misc/event-test -/examples/misc/hellolibvirt -/examples/misc/openauth +/examples/c/admin/client_close +/examples/c/admin/client_info +/examples/c/admin/client_limits +/examples/c/admin/list_clients +/examples/c/admin/list_servers +/examples/c/admin/logging +/examples/c/admin/threadpool_params +/examples/c/domain/dommigrate +/examples/c/domain/domtop +/examples/c/domain/info1 +/examples/c/domain/rename +/examples/c/domain/suspend +/examples/c/misc/event-test +/examples/c/misc/hellolibvirt +/examples/c/misc/openauth /gnulib/lib/* /gnulib/m4/* /gnulib/tests/* diff --git a/cfg.mk b/cfg.mk index 786aa6e80a..5074ef611a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1253,7 +1253,7 @@ exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \ ^src/rpc/gendispatch\.pl$$ exclude_file_name_regexp--sc_prohibit_nonreentrant = \ - ^((po|tests|examples/admin)/|docs/.*(py|js|html\.in)|run.in$$|tools/wireshark/util/genxdrstub\.pl$$) + ^((po|tests|examples)/|docs/.*(py|js|html\.in)|run.in$$|tools/wireshark/util/genxdrstub\.pl$$) exclude_file_name_regexp--sc_prohibit_select = \ ^cfg\.mk$$ diff --git a/examples/Makefile.am b/examples/Makefile.am index 50dae304e8..0adb4b42e2 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -19,15 +19,15 @@ FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml) ADMIN_EXAMPLES = \ - $(wildcard $(srcdir)/admin/*.c) \ + $(wildcard $(srcdir)/c/admin/*.c) \ $(NULL) DOMAIN_EXAMPLES = \ - $(wildcard $(srcdir)/domain/*.c) \ + $(wildcard $(srcdir)/c/domain/*.c) \ $(NULL) MISC_EXAMPLES = \ - $(wildcard $(srcdir)/misc/*.c) \ + $(wildcard $(srcdir)/c/misc/*.c) \ $(NULL) POLKIT_EXAMPLES = \ @@ -78,38 +78,38 @@ LDADD = \ $(NULL) noinst_PROGRAMS = \ - admin/client_close \ - admin/client_info \ - admin/client_limits \ - admin/list_clients \ - admin/list_servers \ - admin/logging \ - admin/threadpool_params \ - domain/dommigrate \ - domain/domtop \ - domain/info1 \ - domain/rename \ - domain/suspend \ - misc/event-test \ - misc/hellolibvirt \ - misc/openauth \ + c/admin/client_close \ + c/admin/client_info \ + c/admin/client_limits \ + c/admin/list_clients \ + c/admin/list_servers \ + c/admin/logging \ + c/admin/threadpool_params \ + c/domain/dommigrate \ + c/domain/domtop \ + c/domain/info1 \ + c/domain/rename \ + c/domain/suspend \ + c/misc/event-test \ + c/misc/hellolibvirt \ + c/misc/openauth \ $(NULL) -admin_client_close_SOURCES = admin/client_close.c -admin_client_info_SOURCES = admin/client_info.c -admin_client_limits_SOURCES = admin/client_limits.c -admin_list_clients_SOURCES = admin/list_clients.c -admin_list_servers_SOURCES = admin/list_servers.c -admin_logging_SOURCES = admin/logging.c -admin_threadpool_params_SOURCES = admin/threadpool_params.c -domain_dommigrate_SOURCES = domain/dommigrate.c -domain_domtop_SOURCES = domain/domtop.c -domain_info1_SOURCES = domain/info1.c -domain_rename_SOURCES = domain/rename.c -domain_suspend_SOURCES = domain/suspend.c -misc_event_test_SOURCES = misc/event-test.c -misc_hellolibvirt_SOURCES = misc/hellolibvirt.c -misc_openauth_SOURCES = misc/openauth.c +c_admin_client_close_SOURCES = c/admin/client_close.c +c_admin_client_info_SOURCES = c/admin/client_info.c +c_admin_client_limits_SOURCES = c/admin/client_limits.c +c_admin_list_clients_SOURCES = c/admin/list_clients.c +c_admin_list_servers_SOURCES = c/admin/list_servers.c +c_admin_logging_SOURCES = c/admin/logging.c +c_admin_threadpool_params_SOURCES = c/admin/threadpool_params.c +c_domain_dommigrate_SOURCES = c/domain/dommigrate.c +c_domain_domtop_SOURCES = c/domain/domtop.c +c_domain_info1_SOURCES = c/domain/info1.c +c_domain_rename_SOURCES = c/domain/rename.c +c_domain_suspend_SOURCES = c/domain/suspend.c +c_misc_event_test_SOURCES = c/misc/event-test.c +c_misc_hellolibvirt_SOURCES = c/misc/hellolibvirt.c +c_misc_openauth_SOURCES = c/misc/openauth.c if WITH_NWFILTER @@ -120,13 +120,13 @@ endif WITH_NWFILTER examplesdir = $(docdir)/examples -adminexamplesdir = $(examplesdir)/admin +adminexamplesdir = $(examplesdir)/c/admin adminexamples_DATA = $(ADMIN_EXAMPLES) -domainexamplesdir = $(examplesdir)/domain +domainexamplesdir = $(examplesdir)/c/domain domainexamples_DATA = $(DOMAIN_EXAMPLES) -miscexamplesdir = $(examplesdir)/misc +miscexamplesdir = $(examplesdir)/c/misc miscexamples_DATA = $(MISC_EXAMPLES) polkitexamplesdir = $(examplesdir)/polkit diff --git a/examples/admin/client_close.c b/examples/c/admin/client_close.c similarity index 100% rename from examples/admin/client_close.c rename to examples/c/admin/client_close.c diff --git a/examples/admin/client_info.c b/examples/c/admin/client_info.c similarity index 100% rename from examples/admin/client_info.c rename to examples/c/admin/client_info.c diff --git a/examples/admin/client_limits.c b/examples/c/admin/client_limits.c similarity index 100% rename from examples/admin/client_limits.c rename to examples/c/admin/client_limits.c diff --git a/examples/admin/list_clients.c b/examples/c/admin/list_clients.c similarity index 100% rename from examples/admin/list_clients.c rename to examples/c/admin/list_clients.c diff --git a/examples/admin/list_servers.c b/examples/c/admin/list_servers.c similarity index 100% rename from examples/admin/list_servers.c rename to examples/c/admin/list_servers.c diff --git a/examples/admin/logging.c b/examples/c/admin/logging.c similarity index 100% rename from examples/admin/logging.c rename to examples/c/admin/logging.c diff --git a/examples/admin/threadpool_params.c b/examples/c/admin/threadpool_params.c similarity index 100% rename from examples/admin/threadpool_params.c rename to examples/c/admin/threadpool_params.c diff --git a/examples/domain/dommigrate.c b/examples/c/domain/dommigrate.c similarity index 100% rename from examples/domain/dommigrate.c rename to examples/c/domain/dommigrate.c diff --git a/examples/domain/domtop.c b/examples/c/domain/domtop.c similarity index 100% rename from examples/domain/domtop.c rename to examples/c/domain/domtop.c diff --git a/examples/domain/info1.c b/examples/c/domain/info1.c similarity index 100% rename from examples/domain/info1.c rename to examples/c/domain/info1.c diff --git a/examples/domain/rename.c b/examples/c/domain/rename.c similarity index 100% rename from examples/domain/rename.c rename to examples/c/domain/rename.c diff --git a/examples/domain/suspend.c b/examples/c/domain/suspend.c similarity index 100% rename from examples/domain/suspend.c rename to examples/c/domain/suspend.c diff --git a/examples/misc/event-test.c b/examples/c/misc/event-test.c similarity index 100% rename from examples/misc/event-test.c rename to examples/c/misc/event-test.c diff --git a/examples/misc/hellolibvirt.c b/examples/c/misc/hellolibvirt.c similarity index 100% rename from examples/misc/hellolibvirt.c rename to examples/c/misc/hellolibvirt.c diff --git a/examples/misc/openauth.c b/examples/c/misc/openauth.c similarity index 100% rename from examples/misc/openauth.c rename to examples/c/misc/openauth.c