analyze: Cosmetic exit when the bootup is not yet complete when plotting.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2699e594c37c2f66cd39bf694e48e03463018273..219d8ded8e6115c14f63f2dd8c24e440bb49f420 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,6 +107,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/systemd
 
 AM_CFLAGS = $(WARNINGFLAGS)
+AM_LDFLAGS = $(GCLDFLAGS)
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -288,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 \
@@ -301,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 \
@@ -690,24 +685,18 @@ MANPAGES = \
        man/sysctl.d.5 \
        man/systemd-ask-password.1 \
        man/systemd-cat.1 \
-        man/systemd-machine-id-setup.1 \
-        man/systemd-journald.conf.5 \
-        man/journalctl.1
+       man/systemd-machine-id-setup.1 \
+       man/journald.conf.5 \
+       man/journalctl.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/init.1 \
-        man/systemd-systemctl.1 \
-        man/systemd-loginctl.1 \
-        man/systemd-journalctl.1
+       man/init.1
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
-man/systemd-systemctl.1: man/systemctl.1
-man/systemd-loginctl.1: man/loginctl.1
-man/systemd-journalctl.1: man/journalctl.1
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -987,14 +976,6 @@ systemctl_LDADD = \
        libsystemd-id128.la \
        $(DBUS_LIBS)
 
-systemctl-install-hook:
-       cd $(DESTDIR)$(rootbindir) && \
-               rm -f systemd-systemctl && \
-               $(LN_S) systemctl systemd-systemctl
-
-INSTALL_EXEC_HOOKS += \
-        systemctl-install-hook
-
 systemd_notify_SOURCES = \
        src/notify.c \
        src/readahead/sd-readahead.c
@@ -1243,14 +1224,6 @@ journalctl_LDADD += \
        $(XZ_LIBS)
 endif
 
-journalctl-install-hook:
-       cd $(DESTDIR)$(rootbindir) && \
-               rm -f systemd-journalctl && \
-               $(LN_S) journalctl systemd-journalctl
-
-INSTALL_EXEC_HOOKS += \
-        journalctl-install-hook
-
 test_journal_SOURCES = \
        src/journal/test-journal.c \
        src/journal/sd-journal.c \
@@ -1274,6 +1247,13 @@ test_journal_LDADD += \
        $(XZ_LIBS)
 endif
 
+test_journal_send_SOURCES = \
+       src/journal/test-journal-send.c
+
+test_journal_send_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-journal.la
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
@@ -1324,7 +1304,8 @@ UNINSTALL_EXEC_HOOKS += \
        libsystemd-journal-uninstall-hook
 
 noinst_PROGRAMS += \
-       test-journal
+       test-journal \
+        test-journal-send
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -1349,7 +1330,7 @@ nodist_systemunit_DATA += \
        units/systemd-journald.service
 
 dist_pkgsysconf_DATA += \
-       src/journal/systemd-journald.conf
+       src/journal/journald.conf
 
 pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
@@ -1858,14 +1839,6 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
        loginctl
 
-loginctl-install-hook:
-       cd $(DESTDIR)$(rootbindir) && \
-               rm -f systemd-loginctl && \
-               $(LN_S) loginctl systemd-loginctl
-
-INSTALL_EXEC_HOOKS += \
-        loginctl-install-hook
-
 test_login_SOURCES = \
        src/login/test-login.c
 
@@ -1950,7 +1923,7 @@ dist_dbuspolicy_DATA += \
        src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-       src/login/systemd-logind.conf
+       src/login/logind.conf
 
 pkginclude_HEADERS += \
        src/systemd/sd-login.h
@@ -2027,7 +2000,7 @@ nodist_udevrules_DATA += \
        src/login/73-seat-late.rules
 
 MANPAGES += \
-       man/systemd-logind.conf.5 \
+       man/logind.conf.5 \
        man/sd-login.7 \
        man/loginctl.1 \
        man/sd_login_monitor_new.3 \
@@ -2282,13 +2255,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 && \
@@ -2447,12 +2418,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)