ryantimwilson / rpms / systemd

Forked from rpms/systemd 2 months ago
Clone
Zbigniew Jędrzejewski-Szmek 62fe94
From 782c2652920821fe6b7d5710911630b55f5efcec Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek 62fe94
From: Lennart Poettering <lennart@poettering.net>
Zbigniew Jędrzejewski-Szmek 62fe94
Date: Thu, 4 Sep 2014 21:40:00 +0200
Zbigniew Jędrzejewski-Szmek 62fe94
Subject: [PATCH] hibernate-resume: let's move all hibernate-resume tools into
Zbigniew Jędrzejewski-Szmek 62fe94
 the same directory
Zbigniew Jędrzejewski-Szmek 62fe94
Zbigniew Jędrzejewski-Szmek 62fe94
They are closely related, so let's move them together, and clean up the
Zbigniew Jędrzejewski-Szmek 62fe94
.c file naming while we are at it.
Zbigniew Jędrzejewski-Szmek 62fe94
---
Zbigniew Jędrzejewski-Szmek 62fe94
 Makefile.am                                                             | 2 +-
Zbigniew Jędrzejewski-Szmek 62fe94
 .../hibernate-resume-generator.c}                                       | 0
Zbigniew Jędrzejewski-Szmek 62fe94
 src/resume-generator/Makefile                                           | 1 -
Zbigniew Jędrzejewski-Szmek 62fe94
 3 files changed, 1 insertion(+), 2 deletions(-)
Zbigniew Jędrzejewski-Szmek 62fe94
 rename src/{resume-generator/resume-generator.c => hibernate-resume/hibernate-resume-generator.c} (100%)
Zbigniew Jędrzejewski-Szmek 62fe94
 delete mode 120000 src/resume-generator/Makefile
Zbigniew Jędrzejewski-Szmek 62fe94
Zbigniew Jędrzejewski-Szmek 62fe94
diff --git a/Makefile.am b/Makefile.am
Zbigniew Jędrzejewski-Szmek 62fe94
index e534a23886..9c946d7a92 100644
Zbigniew Jędrzejewski-Szmek 62fe94
--- a/Makefile.am
Zbigniew Jędrzejewski-Szmek 62fe94
+++ b/Makefile.am
Zbigniew Jędrzejewski-Szmek 62fe94
@@ -2168,7 +2168,7 @@ systemd_hibernate_resume_LDADD = \
Zbigniew Jędrzejewski-Szmek 62fe94
         libsystemd-shared.la
Zbigniew Jędrzejewski-Szmek 62fe94
 
Zbigniew Jędrzejewski-Szmek 62fe94
 systemd_hibernate_resume_generator_SOURCES = \
Zbigniew Jędrzejewski-Szmek 62fe94
-	src/resume-generator/resume-generator.c
Zbigniew Jędrzejewski-Szmek 62fe94
+	src/hibernate-resume/hibernate-resume-generator.c
Zbigniew Jędrzejewski-Szmek 62fe94
 
Zbigniew Jędrzejewski-Szmek 62fe94
 systemd_hibernate_resume_generator_LDADD = \
Zbigniew Jędrzejewski-Szmek 62fe94
 	libsystemd-label.la \
Zbigniew Jędrzejewski-Szmek 62fe94
diff --git a/src/resume-generator/resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
Zbigniew Jędrzejewski-Szmek 62fe94
similarity index 100%
Zbigniew Jędrzejewski-Szmek 62fe94
rename from src/resume-generator/resume-generator.c
Zbigniew Jędrzejewski-Szmek 62fe94
rename to src/hibernate-resume/hibernate-resume-generator.c
Zbigniew Jędrzejewski-Szmek 62fe94
diff --git a/src/resume-generator/Makefile b/src/resume-generator/Makefile
Zbigniew Jędrzejewski-Szmek 62fe94
deleted file mode 120000
Zbigniew Jędrzejewski-Szmek 62fe94
index d0b0e8e008..0000000000
Zbigniew Jędrzejewski-Szmek 62fe94
--- a/src/resume-generator/Makefile
Zbigniew Jędrzejewski-Szmek 62fe94
+++ /dev/null
Zbigniew Jędrzejewski-Szmek 62fe94
@@ -1 +0,0 @@
Zbigniew Jędrzejewski-Szmek 62fe94
-../Makefile
Zbigniew Jędrzejewski-Szmek 62fe94
\ No newline at end of file