From 54d4b75ec835294cd88f4ce8cdbd236bb4dac95a Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay@vrfy.org> Date: Thu, 12 Apr 2012 14:40:20 +0200 Subject: [PATCH] move remainig shared stuff to shared/ (cherry picked from commit 3bdf9c1d0a241eff2d17591854172725682b27cd) --- Makefile.am | 43 +++++++++++++++-------------------- src/{ => shared}/ask-password-api.c | 0 src/{ => shared}/dbus-loop.c | 0 src/{ => shared}/dbus-loop.h | 0 src/{ => shared}/def.h | 0 src/{ => shared}/missing.h | 0 src/{ => shared}/polkit.c | 0 src/{ => shared}/polkit.h | 0 8 files changed, 18 insertions(+), 25 deletions(-) rename src/{ => shared}/ask-password-api.c (100%) rename src/{ => shared}/dbus-loop.c (100%) rename src/{ => shared}/dbus-loop.h (100%) rename src/{ => shared}/def.h (100%) rename src/{ => shared}/missing.h (100%) rename src/{ => shared}/polkit.c (100%) rename src/{ => shared}/polkit.h (100%) diff --git a/Makefile.am b/Makefile.am index 7824297..d54d5df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,6 +111,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src \ -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/login \ + -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ -I $(top_srcdir)/src/core @@ -507,9 +508,12 @@ noinst_LTLIBRARIES += \ libsystemd-shared.la libsystemd_shared_la_SOURCES = \ - src/missing.h \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + src/shared/missing.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ @@ -539,6 +543,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/cgroup-util.h \ src/shared/dbus-common.c \ src/shared/dbus-common.h \ + src/shared/dbus-loop.c \ + src/shared/dbus-loop.h \ src/shared/logs-show.c \ src/shared/logs-show.h \ src/shared/cgroup-show.c \ @@ -561,9 +567,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/specifier.h \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h \ - src/shared/list.h \ - src/shared/macro.h \ - src/shared/ask-password-api.h + src/shared/polkit.c \ + src/shared/polkit.h libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -583,7 +588,9 @@ libsystemd_label_la_SOURCES = \ src/shared/label.c \ src/shared/label.h \ src/shared/mkdir.c \ - src/shared/mkdir.h + src/shared/mkdir.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -641,7 +648,6 @@ noinst_LTLIBRARIES += \ libsystemd-core.la libsystemd_core_la_SOURCES = \ - src/def.h \ src/core/unit.c \ src/core/unit.h \ src/core/job.c \ @@ -1098,8 +1104,7 @@ systemd_notify_LDADD = \ # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ - src/ask-password.c \ - src/ask-password-api.c + src/ask-password.c systemd_ask_password_LDADD = \ libsystemd-label.la \ @@ -1191,8 +1196,7 @@ systemd_gnome_ask_password_agent_LDADD = \ # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ - src/tty-ask-password-agent.c \ - src/ask-password-api.c + src/tty-ask-password-agent.c systemd_tty_ask_password_agent_LDADD = \ libsystemd-label.la \ @@ -1745,8 +1749,7 @@ dist_systemunit_DATA += \ units/cryptsetup.target systemd_cryptsetup_SOURCES = \ - src/cryptsetup/cryptsetup.c \ - src/ask-password-api.c + src/cryptsetup/cryptsetup.c systemd_cryptsetup_CFLAGS = \ $(AM_CFLAGS) \ @@ -1780,9 +1783,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ - src/hostname/hostnamed.c \ - src/polkit.c \ - src/polkit.h + src/hostname/hostnamed.c systemd_hostnamed_CFLAGS = \ $(AM_CFLAGS) \ @@ -1831,9 +1832,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ - src/locale/localed.c \ - src/polkit.c \ - src/polkit.h + src/locale/localed.c systemd_localed_CFLAGS = \ $(AM_CFLAGS) \ @@ -1893,9 +1892,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ - src/timedate/timedated.c \ - src/polkit.c \ - src/polkit.h + src/timedate/timedated.c systemd_timedated_CFLAGS = \ $(AM_CFLAGS) \ @@ -1958,10 +1955,6 @@ systemd_logind_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/dbus-loop.c \ - src/dbus-loop.h \ - src/polkit.c \ - src/polkit.h \ src/login/logind-acl.h nodist_systemd_logind_SOURCES = \ diff --git a/src/ask-password-api.c b/src/shared/ask-password-api.c similarity index 100% rename from src/ask-password-api.c rename to src/shared/ask-password-api.c diff --git a/src/dbus-loop.c b/src/shared/dbus-loop.c similarity index 100% rename from src/dbus-loop.c rename to src/shared/dbus-loop.c diff --git a/src/dbus-loop.h b/src/shared/dbus-loop.h similarity index 100% rename from src/dbus-loop.h rename to src/shared/dbus-loop.h diff --git a/src/def.h b/src/shared/def.h similarity index 100% rename from src/def.h rename to src/shared/def.h diff --git a/src/missing.h b/src/shared/missing.h similarity index 100% rename from src/missing.h rename to src/shared/missing.h diff --git a/src/polkit.c b/src/shared/polkit.c similarity index 100% rename from src/polkit.c rename to src/shared/polkit.c diff --git a/src/polkit.h b/src/shared/polkit.h similarity index 100% rename from src/polkit.h rename to src/shared/polkit.h