diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-04-12 12:58:55 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-04-12 13:12:06 +0200 |
| commit | 78a825f216d39ee0295b00647b059d45467e1d02 (patch) | |
| tree | d9d92f99691ecfd509d9f7f4514cdb85aee2e682 | |
| parent | 68fb08920b2162b48cf0fa8dd98b021327b42896 (diff) | |
rename machine-id-main.c tomacht the binary and move main.c to core/
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/core/main.c (renamed from src/main.c) | 2 | ||||
| -rw-r--r-- | src/machine-id-setup.c (renamed from src/machine-id-main.c) | 2 | ||||
| -rw-r--r-- | src/shared/machine-id-util.c (renamed from src/shared/machine-id-setup.c) | 2 | ||||
| -rw-r--r-- | src/shared/machine-id-util.h (renamed from src/shared/machine-id-setup.h) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 6601e18d03..f7864d8309 100644 --- 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/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 \ diff --git a/configure.ac b/configure.ac index 93523d53d9..aa13fece97 100644 --- 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_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 diff --git a/src/main.c b/src/core/main.c index f03b959f68..4c2be261f5 100644 --- 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 "machine-id-setup.h" +#include "machine-id-util.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 index ca8af596f7..cb8101ea3c 100644 --- a/src/machine-id-main.c +++ b/src/machine-id-setup.c @@ -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[]) { diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-util.c index 9e84ac0cb9..d65fd51131 100644 --- a/src/shared/machine-id-setup.c +++ b/src/shared/machine-id-util.c @@ -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" diff --git a/src/shared/machine-id-setup.h b/src/shared/machine-id-util.h index 16f45d86d3..16f45d86d3 100644 --- a/src/shared/machine-id-setup.h +++ b/src/shared/machine-id-util.h |