rename machine-id-main.c tomacht the binary and move main.c to core/

diff --git a/Makefile.am b/Makefile.am
index 6601e18d034fa8a0e8e235b6a1df75ab58d795bd..f7864d8309276231bd17dcdb3f7e6a69e642d38c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -603,8 +603,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-ask-password-agent.h \
        src/shared/mount-setup.c \
        src/shared/mount-setup.h \
        src/shared/spawn-ask-password-agent.h \
        src/shared/mount-setup.c \
        src/shared/mount-setup.h \

-       src/shared/machine-id-setup.c \
-       src/shared/machine-id-setup.h \
+       src/shared/machine-id-util.c \
+       src/shared/machine-id-util.h \

        src/shared/loopback-setup.h \
        src/shared/loopback-setup.c \
        src/shared/specifier.c \
        src/shared/loopback-setup.h \
        src/shared/loopback-setup.c \
        src/shared/specifier.c \


@@ -815,7 +815,7 @@ libsystemd_core_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \

-       src/main.c
+       src/core/main.c

 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \


@@ -979,7 +979,7 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \

-       src/machine-id-main.c
+       src/machine-id-setup.c

 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \

diff --git a/configure.ac b/configure.ac
index 93523d53d980bbebc7d810f9c887d8aff138dc9a..aa13fece9773cff9a319dc813fc358399e6ec036 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PREREQ(2.63)
 
 AC_INIT([systemd],[182],[systemd-devel@lists.freedesktop.org])
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])
 
 AC_INIT([systemd],[182],[systemd-devel@lists.freedesktop.org])
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])

-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_SRCDIR([src/core/main.c])

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_USE_SYSTEM_EXTENSIONS

diff --git a/src/main.c b/src/core/main.c
similarity index 99%
rename from src/main.c
rename to src/core/main.c
index f03b959f68998500a36e282f05d85a10536befb7..4c2be261f5130393be24cf8345ac729cdc2b1a7d 100644 (file)
--- a/src/main.c
+++ b/src/core/main.c
@@ -42,7 +42,7 @@
 #include "locale-setup.h"
 #include "selinux-setup.h"
 #include "ima-setup.h"
 #include "locale-setup.h"
 #include "selinux-setup.h"
 #include "ima-setup.h"

-#include "machine-id-setup.h"
+#include "machine-id-util.h"

 #include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"
 #include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"

diff --git a/src/machine-id-main.c b/src/machine-id-setup.c
similarity index 97%
rename from src/machine-id-main.c
rename to src/machine-id-setup.c
index ca8af596f7b346886585bc17a07af641e486ff46..cb8101ea3c1214c2a5b586ad314011b2b435e039 100644 (file)
--- a/src/machine-id-main.c
+++ b/src/machine-id-setup.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 

-#include "machine-id-setup.h"
+#include "machine-id-util.h"

 #include "log.h"
 
 int main(int argc, char *argv[]) {
 #include "log.h"
 
 int main(int argc, char *argv[]) {

diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-util.c
similarity index 99%
rename from src/shared/machine-id-setup.c
rename to src/shared/machine-id-util.c
index 9e84ac0cb990757d6981d1adef8c8d9507bdea12..d65fd51131ab8697fdac996a4585d83103ef6333 100644 (file)
--- a/src/shared/machine-id-setup.c
+++ b/src/shared/machine-id-util.c
@@ -29,7 +29,7 @@
 
 #include <systemd/sd-id128.h>
 
 
 #include <systemd/sd-id128.h>
 

-#include "machine-id-setup.h"
+#include "machine-id-util.h"

 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"

diff --git a/src/shared/machine-id-setup.h b/src/shared/machine-id-util.h
similarity index 100%
rename from src/shared/machine-id-setup.h
rename to src/shared/machine-id-util.h