units: we no longer need m4 to build graphical.target or multi-user.taregt

diff --git a/Makefile.am b/Makefile.am
index 3120e786473006131080b085599d28dc78567dfd..5769dcb62ce54cb7b1e5941f6547816138125b7c 100644 (file)
--- 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 a64cac13e29dd37c0c887cc9520178ec9b63a67d..cb0c7d5c0a2d2d9b6c20bf1f1897d0d742b82dce 100644 (file)
--- 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
similarity index 100%
rename from units/graphical.target.m4
rename to units/graphical.target

diff --git a/units/multi-user.target.m4 b/units/multi-user.target
similarity index 100%
rename from units/multi-user.target.m4
rename to units/multi-user.target