osinfo_enum_types.h was depending on libosinfo_1_0_include_HEADERS, which contains osinfo_enum_types.h. This caused a build-time warning from make about a circular dependency. --- osinfo/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am index 361eb94..087e5a3 100644 --- a/osinfo/Makefile.am +++ b/osinfo/Makefile.am @@ -53,7 +53,7 @@ libosinfo_1_0_la_DEPENDENCIES = libosinfo.syms libosinfo_1_0_includedir = $(includedir)/libosinfo-1.0/osinfo -libosinfo_1_0_include_HEADERS = \ +OSINFO_HEADER_FILES = \ osinfo.h \ osinfo_avatar_format.h \ osinfo_db.h \ @@ -64,7 +64,6 @@ libosinfo_1_0_include_HEADERS = \ osinfo_devicelinklist.h \ osinfo_devicelinkfilter.h \ osinfo_entity.h \ - osinfo_enum_types.h \ osinfo_filter.h \ osinfo_install_config.h \ osinfo_install_config_param.h \ @@ -90,6 +89,10 @@ libosinfo_1_0_include_HEADERS = \ osinfo_treelist.h \ $(NULL) +libosinfo_1_0_include_HEADERS = \ + $(OSINFO_HEADER_FILES) \ + osinfo_enum_types.h + libosinfo_1_0_la_SOURCES = \ osinfo_avatar_format.c \ osinfo_entity.c \ @@ -127,10 +130,10 @@ libosinfo_1_0_la_SOURCES = \ osinfo_loader.c \ $(NULL) -osinfo_enum_types.h: $(libosinfo_1_0_include_HEADERS) osinfo_enum_types.h.template +osinfo_enum_types.h: $(OSINFO_HEADER_FILES) osinfo_enum_types.h.template $(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.h.template $(libosinfo_1_0_include_HEADERS:%=$(srcdir)/%) ) > $(srcdir)/osinfo_enum_types.h -osinfo_enum_types.c: $(libosinfo_1_0_include_HEADERS) osinfo_enum_types.c.template +osinfo_enum_types.c: $(OSINFO_HEADER_FILES) osinfo_enum_types.c.template $(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.c.template $(libosinfo_1_0_include_HEADERS:%=$(srcdir)/%) ) > $(srcdir)/osinfo_enum_types.c if WITH_GOBJECT_INTROSPECTION -- 1.8.0.1 _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
