chiark / gitweb /
rename machine-id-main.c tomacht the binary and move main.c to core/
authorKay Sievers <kay@vrfy.org>
Thu, 12 Apr 2012 10:58:55 +0000 (12:58 +0200)
committerKay Sievers <kay@vrfy.org>
Thu, 12 Apr 2012 11:12:06 +0000 (13:12 +0200)
Makefile.am
configure.ac
src/core/main.c [moved from src/main.c with 99% similarity]
src/machine-id-setup.c [moved from src/machine-id-main.c with 97% similarity]
src/shared/machine-id-util.c [moved from src/shared/machine-id-setup.c with 99% similarity]
src/shared/machine-id-util.h [moved from src/shared/machine-id-setup.h with 100% similarity]

index 6601e18..f7864d8 100644 (file)
@@ -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/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 \
@@ -815,7 +815,7 @@ libsystemd_core_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
-       src/main.c
+       src/core/main.c
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
@@ -979,7 +979,7 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-       src/machine-id-main.c
+       src/machine-id-setup.c
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
index 93523d5..aa13fec 100644 (file)
@@ -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_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
similarity index 99%
rename from src/main.c
rename to src/core/main.c
index f03b959..4c2be26 100644 (file)
@@ -42,7 +42,7 @@
 #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"
similarity index 97%
rename from src/machine-id-main.c
rename to src/machine-id-setup.c
index ca8af59..cb8101e 100644 (file)
@@ -22,7 +22,7 @@
 #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[]) {
similarity index 99%
rename from src/shared/machine-id-setup.c
rename to src/shared/machine-id-util.c
index 9e84ac0..d65fd51 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <systemd/sd-id128.h>
 
-#include "machine-id-setup.h"
+#include "machine-id-util.h"
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"