Sophie

Sophie

distrib > Fedora > 17 > i386 > media > updates-src > by-pkgid > ab4b662b9827b6375ffd451bf4abd615 > files > 59

systemd-44-24.fc17.src.rpm

From 3418d784d8f020ae3491913b0292eedc0959a2fe Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Tue, 10 Apr 2012 19:32:48 +0200
Subject: [PATCH] move pager.[ch] to shared/ (cherry picked from commit
 9f36aa6846d795c39d453726b868dfb6e3c5b78d)

---
 Makefile.am              |   13 +++++--------
 src/{ => shared}/pager.c |    0
 src/{ => shared}/pager.h |    0
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename src/{ => shared}/pager.c (100%)
 rename src/{ => shared}/pager.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 066d9aa..0b6728f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -565,7 +565,9 @@ libsystemd_basic_la_SOURCES = \
 	src/shared/utf8.c \
 	src/shared/utf8.h \
 	src/shared/cgroup-util.c \
-	src/shared/cgroup-util.h
+	src/shared/cgroup-util.h \
+	src/shared/pager.c \
+	src/shared/pager.h
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -741,7 +743,6 @@ libsystemd_core_la_SOURCES = \
 	src/shutdownd.h \
 	src/umount.h \
 	src/ask-password-api.h \
-	src/pager.h \
 	src/sysfs-show.h \
 	src/polkit.h \
 	src/dbus-loop.h \
@@ -1052,7 +1053,6 @@ systemctl_SOURCES = \
 	src/path-lookup.c \
 	src/cgroup-show.c \
 	src/unit-name.c \
-	src/pager.c \
 	src/install.c \
 	src/spawn-agent.c \
 	src/logs-show.c
@@ -1095,8 +1095,7 @@ systemd_reply_password_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls.c \
-	src/cgroup-show.c \
-	src/pager.c
+	src/cgroup-show.c
 
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
@@ -1351,7 +1350,6 @@ systemd_cat_LDADD = \
 
 journalctl_SOURCES = \
 	src/journal/journalctl.c \
-	src/pager.c \
 	src/logs-show.c
 
 journalctl_LDADD = \
@@ -1967,8 +1965,7 @@ loginctl_SOURCES = \
 	src/login/loginctl.c \
 	src/login/sysfs-show.c \
 	src/dbus-common.c \
-	src/cgroup-show.c \
-	src/pager.c
+	src/cgroup-show.c
 
 loginctl_CFLAGS = \
 	$(AM_CFLAGS) \
diff --git a/src/pager.c b/src/shared/pager.c
similarity index 100%
rename from src/pager.c
rename to src/shared/pager.c
diff --git a/src/pager.h b/src/shared/pager.h
similarity index 100%
rename from src/pager.h
rename to src/shared/pager.h