summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-18 04:59:05 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-18 04:59:05 +0100
commitdb25d1d7655b1de4554942e49bc80a9b176ef8df (patch)
tree650a011fcb2ea0d6b7794322ffce0ae2348b98d0
parent28cf382a0afd10d0e2a71d152f0df4909e90d159 (diff)
units: we no longer need m4 to build graphical.target or multi-user.taregt
-rw-r--r--Makefile.am6
-rw-r--r--units/.gitignore2
-rw-r--r--units/graphical.target (renamed from units/graphical.target.m4)0
-rw-r--r--units/multi-user.target (renamed from units/multi-user.target.m4)0
4 files changed, 2 insertions, 6 deletions
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.m4 b/units/graphical.target
index f2e30341d4..f2e30341d4 100644
--- a/units/graphical.target.m4
+++ b/units/graphical.target
diff --git a/units/multi-user.target.m4 b/units/multi-user.target
index 66f1a950f9..66f1a950f9 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target