Use BUILT_SOURCES to fix some build dependencies problem

2 files changed, 13 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 384656e..7bd48d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,13 @@
 # vim: set sw=8 ts=8 sts=8 noet:
 
 NULL =
-noinst_PROGRAMS =
-EXTRA_DIST =
-
 
+noinst_PROGRAMS =
 
+EXTRA_DIST = \
+	autoar-enum-types.h.template \
+	autoar-enum-types.c.template \
+	$(NULL)
 
 noinst_LTLIBRARIES = libautoarchive.la
 
@@ -54,6 +56,10 @@ test_extract_LDADD = \
 	libautoarchive.la	\
 	$(NULL)
 
-CLEANFILES = $(libautoarchive_generated_sources)
-DISTCLEANFILES = $(libautoarchive_generated_sources)
-MAINTAINERCLEANFILES = $(libautoarchive_generated_sources)
+BUILT_SOURCES = \
+	$(libautoarchive_generated_sources)	\
+	$(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
diff --git a/autoar-enum-types.c.template b/autoar-enum-types.c.template
index eda4fc9..96aee62 100644
--- a/autoar-enum-types.c.template
+++ b/autoar-enum-types.c.template
@@ -14,7 +14,7 @@ GType
 @enum_name@_get_type (void)
 {
   static GType type = 0;
-  if (!type)
+  if (G_UNLIKELY (!type))
   {
     static const G@Type@Value values[] = {
 /*** END value-header ***/