From db25d1d7655b1de4554942e49bc80a9b176ef8df Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Mar 2011 04:59:05 +0100
Subject: units: we no longer need m4 to build graphical.target or
 multi-user.taregt

---
 Makefile.am                |  6 ++----
 units/.gitignore           |  2 --
 units/graphical.target     | 18 ++++++++++++++++++
 units/graphical.target.m4  | 18 ------------------
 units/multi-user.target    | 18 ++++++++++++++++++
 units/multi-user.target.m4 | 18 ------------------
 6 files changed, 38 insertions(+), 42 deletions(-)
 create mode 100644 units/graphical.target
 delete mode 100644 units/graphical.target.m4
 create mode 100644 units/multi-user.target
 delete mode 100644 units/multi-user.target.m4

diff --git a/Makefile.am b/Makefile.am
index 3120e78647..5769dcb62c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,6 +205,8 @@ dist_tmpfiles_DATA = \
 	tmpfiles.d/x11.conf
 
 dist_systemunit_DATA = \
+	units/graphical.target \
+	units/multi-user.target \
 	units/emergency.service \
 	units/emergency.target \
 	units/sysinit.target \
@@ -263,9 +265,7 @@ nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
         units/console-shell.service \
-	units/graphical.target \
 	units/remote-fs.target \
-	units/multi-user.target \
 	units/systemd-initctl.service \
 	units/systemd-logger.service \
 	units/systemd-shutdownd.service \
@@ -308,8 +308,6 @@ EXTRA_DIST = \
 	units/getty@.service.m4 \
 	units/serial-getty@.service.m4 \
         units/console-shell.service.m4 \
-	units/graphical.target.m4 \
-	units/multi-user.target.m4 \
 	units/remote-fs.target.m4 \
 	units/rescue.service.m4 \
 	units/systemd-initctl.service.in \
diff --git a/units/.gitignore b/units/.gitignore
index a64cac13e2..cb0c7d5c0a 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -30,8 +30,6 @@ systemd-random-seed-save.service
 systemd-initctl.service
 systemd-logger.service
 syslog.target
-graphical.target
-multi-user.target
 getty@.service
 remote-fs.target
 systemd-update-utmp-runlevel.service
diff --git a/units/graphical.target b/units/graphical.target
new file mode 100644
index 0000000000..f2e30341d4
--- /dev/null
+++ b/units/graphical.target
@@ -0,0 +1,18 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Graphical Interface
+Requires=multi-user.target
+After=multi-user.target
+Conflicts=rescue.target
+AllowIsolate=yes
+
+[Install]
+Alias=default.target
diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
deleted file mode 100644
index f2e30341d4..0000000000
--- a/units/graphical.target.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Graphical Interface
-Requires=multi-user.target
-After=multi-user.target
-Conflicts=rescue.target
-AllowIsolate=yes
-
-[Install]
-Alias=default.target
diff --git a/units/multi-user.target b/units/multi-user.target
new file mode 100644
index 0000000000..66f1a950f9
--- /dev/null
+++ b/units/multi-user.target
@@ -0,0 +1,18 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Multi-User
+Requires=basic.target
+Conflicts=rescue.service rescue.target
+After=basic.target rescue.service rescue.target
+AllowIsolate=yes
+
+[Install]
+Alias=default.target
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
deleted file mode 100644
index 66f1a950f9..0000000000
--- a/units/multi-user.target.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Multi-User
-Requires=basic.target
-Conflicts=rescue.service rescue.target
-After=basic.target rescue.service rescue.target
-AllowIsolate=yes
-
-[Install]
-Alias=default.target
-- 
cgit v1.2.3-54-g00ecf