units: mount /tmp as tmpfs

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 99ad9c03098cc3c89dd2d87f4920eae6440c6363..daa4030988ab3296d3970180f667bbb64ec0deda 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,9 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/systemd
 
+AM_CFLAGS = $(WARNINGFLAGS)
+AM_LDFLAGS = $(GCLDFLAGS)
+
 if TARGET_GENTOO
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -286,8 +289,7 @@ dist_systemunit_DATA = \
        units/sys-kernel-config.mount \
        units/sys-kernel-debug.mount \
        units/sys-fs-fuse-connections.mount \
-       units/var-run.mount \
-       units/media.mount \
+       units/tmp.mount \
        units/remount-rootfs.service \
        units/printer.target \
        units/sound.target \
@@ -299,11 +301,6 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-console.path \
        units/syslog.target
 
-if HAVE_SYSV_COMPAT
-dist_systemunit_DATA += \
-       units/var-lock.mount
-endif
-
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
@@ -2280,13 +2277,11 @@ systemd-install-data-hook:
                rm -f systemd-remount-api-vfs.service \
                        fsck-root.service \
                        remount-rootfs.service \
-                       var-run.mount \
-                       media.mount && \
+                       tmp.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
-               $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../media.mount media.mount )
+               $(LN_S) ../tmp.mount tmp.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -2445,12 +2440,6 @@ if TARGET_MAGEIA
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
-if HAVE_SYSV_COMPAT
-       ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-               rm -f var-lock.mount && \
-               $(LN_S) ../var-lock.mount var-lock.mount )
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_EXEC_HOOKS)