Move service files back to source directory, rename systemd service file

diff --git a/boot-manager/Makefile.am b/boot-manager/Makefile.am
index abd3284..13263de 100644 (file)
--- a/boot-manager/Makefile.am
+++ b/boot-manager/Makefile.am
@@ -1,9 +1,7 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 
 SUBDIRS =                                                              \
-       busconf                                                         \
-       dbus                                                            \
-       systemd
+       busconf
 
 luc_dir =                                                              \
        $(datadir)/org.genivi.BootManager$(BOOT_MANAGER_VERSION_API)
@@ -78,11 +76,39 @@ boot_manager_LDADD =                                                        \
        $(GLIB_LIBS)                                                    \
        $(SYSTEMD_DAEMON_LIBS)
 
+dbus_servicedir = $(datadir)/dbus-1/system-services
+
+dbus_service_in_files =                                                        \
+       org.genivi.BootManager1.service.in
+
+dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
+
+%.service: %.service.in
+       sed -e "s,\@libdir\@,$(libdir),g"                               \
+           -e "s,\@BOOT_MANAGER_VERSION_API\@,$(BOOT_MANAGER_VERSION_API),g" < $< > $@
+
+systemd_servicedir = /lib/systemd/system
+
+systemd_service_in_files =                                             \
+       boot-manager.service.in
+
+systemd_service_DATA = $(systemd_service_in_files:.service.in=.service)
+
+%.service: %.service.in
+       sed -e "s,\@libdir\@,$(libdir),g"                               \
+           -e "s,\@BOOT_MANAGER_VERSION_API\@,$(BOOT_MANAGER_VERSION_API),g" < $< > $@
+
+CLEANFILES =                                                           \
+       $(dbus_service_DATA)                                            \
+       $(systemd_service_DATA)
+
 EXTRA_DIST =                                                           \
        boot-manager-dbus.xml                                           \
        la-handler-dbus.xml                                             \
        shutdown-consumer-dbus.xml                                      \
-       systemd-manager-dbus.xml
+       systemd-manager-dbus.xml                                        \
+       $(dbus_service_in_files)                                        \
+       $(systemd_service_in_files)
 
 DISTCLEANFILES =                                                       \
        $(boot_manager_built_sources)

diff --git a/boot-manager/systemd/org.genivi.BootManager1.service.in b/boot-manager/boot-manager.service.in
similarity index 100%
rename from boot-manager/systemd/org.genivi.BootManager1.service.in
rename to boot-manager/boot-manager.service.in

diff --git a/boot-manager/dbus/Makefile.am b/boot-manager/dbus/Makefile.am
deleted file mode 100644 (file)
index 6e7b058..0000000
--- a/boot-manager/dbus/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# vi:set ts=8 sw=8 noet ai nocindent:
-
-bus_servicedir = $(datadir)/dbus-1/system-services
-
-bus_service_in_files =                                                 \
-       org.genivi.BootManager1.service.in
-
-bus_service_DATA = $(bus_service_in_files:.service.in=.service)
-
-%.service: %.service.in
-       sed -e "s,\@libdir\@,$(libdir),g"                               \
-           -e "s,\@BOOT_MANAGER_VERSION_API\@,$(BOOT_MANAGER_VERSION_API),g" < $< > $@
-
-CLEANFILES =                                                           \
-       $(bus_service_DATA)
-
-EXTRA_DIST =                                                           \
-       $(bus_service_in_files)
-
-

diff --git a/boot-manager/dbus/org.genivi.BootManager1.service.in b/boot-manager/org.genivi.BootManager1.service.in
similarity index 100%
rename from boot-manager/dbus/org.genivi.BootManager1.service.in
rename to boot-manager/org.genivi.BootManager1.service.in

diff --git a/boot-manager/systemd/Makefile.am b/boot-manager/systemd/Makefile.am
deleted file mode 100644 (file)
index ddc0dea..0000000
--- a/boot-manager/systemd/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# vi:set ts=8 sw=8 noet ai nocindent:
-
-systemd_servicedir = /lib/systemd/system
-
-systemd_service_in_files =                                                     \
-       org.genivi.BootManager1.service.in
-
-systemd_service_DATA = $(systemd_service_in_files:.service.in=.service)
-
-%.service: %.service.in
-       sed -e "s,\@libdir\@,$(libdir),g"                               \
-           -e "s,\@BOOT_MANAGER_VERSION_API\@,$(BOOT_MANAGER_VERSION_API),g" < $< > $@
-
-CLEANFILES =                                                           \
-       $(systemd_service_DATA)
-
-EXTRA_DIST =                                                           \
-       $(systemd_service_in_files)
-
-

diff --git a/configure.ac b/configure.ac
index 5c4e24c..6997edb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,8 +136,6 @@ AC_DEFINE_UNQUOTED([PRIORITISED_LUC_TYPES],
 AC_OUTPUT([
 Makefile
 boot-manager/busconf/Makefile
-boot-manager/dbus/Makefile
-boot-manager/systemd/Makefile
 boot-manager/Makefile
 tests/Makefile
 tests/boot-manager/Makefile