Apply a few changes to fix make distcheck and regular builds

diff --git a/Makefile.am b/Makefile.am
index 1ab1545..0183a76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 
 SUBDIRS =                                                              \
-       boot-manager                                                    \
        common                                                          \
-       docs                                                            \
+       boot-manager                                                    \
        legacy-app-handler                                              \
        nsm-dummy                                                       \
+       docs                                                            \
        tests
 
 .PHONY: ChangeLog

diff --git a/boot-manager/Makefile.am b/boot-manager/Makefile.am
index 92a6fb6..d29e448 100644 (file)
--- a/boot-manager/Makefile.am
+++ b/boot-manager/Makefile.am
@@ -14,9 +14,9 @@ boot_manager_built_headers =                                          \
        systemd-manager-dbus.h
 
 boot_manager_built_sources =                                           \
+       $(boot_manager_built_headers)                                   \
        boot-manager-dbus.c                                             \
-       systemd-manager-dbus.c                                          \
-       $(boot_manager_built_headers)
+       systemd-manager-dbus.c
 
 boot_manager_SOURCES =                                                 \
        boot-manager-application.c                                      \
@@ -96,7 +96,7 @@ DISTCLEANFILES =                                                      \
        $(boot_manager_built_sources)
 
 BUILT_SOURCES =                                                                \
-       $(boot_manager_built_headers)
+       $(boot_manager_built_sources)
 
 boot-manager-dbus.h: boot-manager-dbus.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN)                                    \

diff --git a/boot-manager/busconf/Makefile.am b/boot-manager/busconf/Makefile.am
index 711d8f0..6a03e55 100644 (file)
--- a/boot-manager/busconf/Makefile.am
+++ b/boot-manager/busconf/Makefile.am
@@ -1,6 +1,6 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 
-boot_manager_confdir = /etc/dbus-1/system.d
+boot_manager_confdir = $(sysconfdir)/dbus-1/system.d
 
 boot_manager_conf_DATA =                                               \
        org.genivi.BootManager1.conf

diff --git a/common/Makefile.am b/common/Makefile.am
index 6e85555..e2569bb 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -9,11 +9,11 @@ libcommon_la_built_headers =                                          \
        shutdown-consumer-dbus.h
 
 libcommon_la_built_sources =                                           \
+       $(libcommon_la_built_headers)                                   \
        la-handler-dbus.c                                               \
        nsm-consumer-dbus.c                                             \
        nsm-lifecycle-control-dbus.c                                    \
-       shutdown-consumer-dbus.c                                        \
-       $(libcommon_la_built_headers)
+       shutdown-consumer-dbus.c
 
 libcommon_la_SOURCES =                                                 \
        nsm-enum-types.c                                                \

diff --git a/docs/reference/node-startup-controller/Makefile.am b/docs/reference/node-startup-controller/Makefile.am
index 1877c53..0f17971 100644 (file)
--- a/docs/reference/node-startup-controller/Makefile.am
+++ b/docs/reference/node-startup-controller/Makefile.am
@@ -26,7 +26,7 @@ SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-sections --rebuild-types
+SCAN_OPTIONS=--rebuild-sections
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
@@ -90,12 +90,13 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST +=                                                          \
+       legacy-app-handler.xml                                          \
        version.xml.in
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
+DISTCLEANFILES = $(DOC_MODULE)-sections.txt
 
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks

diff --git a/docs/reference/node-startup-controller/node-startup-controller.types b/docs/reference/node-startup-controller/node-startup-controller.types
new file mode 100644 (file)
index 0000000..e69de29