journal: implicitly add code location to all messages logged with the native interface

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6d0b51a0903389372e73be322c9870c75ad8f383..219d8ded8e6115c14f63f2dd8c24e440bb49f420 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 \
@@ -645,7 +642,9 @@ EXTRA_DIST += \
        src/spawn-agent.h \
        src/acl-util.h \
        src/logs-show.h \
-        src/utf8.h
+        src/utf8.h \
+        src/journal/sparse-endian.h \
+        src/ima-setup.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -686,9 +685,9 @@ 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/systemd-journalctl.1
+       man/systemd-machine-id-setup.1 \
+       man/journald.conf.5 \
+       man/journalctl.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -1205,23 +1204,23 @@ systemd_cat_LDADD = \
        libsystemd-basic.la \
        libsystemd-journal.la
 
-systemd_journalctl_SOURCES = \
+journalctl_SOURCES = \
        src/journal/journalctl.c \
        src/pager.c \
        src/logs-show.c
 
-systemd_journalctl_LDADD = \
+journalctl_LDADD = \
        libsystemd-basic.la \
        libsystemd-journal.la \
        libsystemd-id128.la
 
 if HAVE_XZ
-systemd_journalctl_SOURCES += \
+journalctl_SOURCES += \
        src/journal/compress.c
-systemd_journalctl_CFLAGS = \
+journalctl_CFLAGS = \
        $(AM_CFLAGS) \
        $(XZ_CFLAGS)
-systemd_journalctl_LDADD += \
+journalctl_LDADD += \
        $(XZ_LIBS)
 endif
 
@@ -1248,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 \
@@ -1298,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 \
@@ -1311,7 +1318,7 @@ rootlibexec_PROGRAMS += \
        systemd-journald
 
 rootbin_PROGRAMS += \
-       systemd-journalctl
+       journalctl
 
 bin_PROGRAMS += \
        systemd-cat
@@ -1323,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
@@ -1811,7 +1818,7 @@ rootlibexec_PROGRAMS += \
        systemd-logind \
        systemd-user-sessions
 
-systemd_loginctl_SOURCES = \
+loginctl_SOURCES = \
        src/login/loginctl.c \
        src/login/sysfs-show.c \
        src/dbus-common.c \
@@ -1819,18 +1826,18 @@ systemd_loginctl_SOURCES = \
        src/cgroup-util.c \
        src/pager.c
 
-systemd_loginctl_CFLAGS = \
+loginctl_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
        $(UDEV_CFLAGS)
 
-systemd_loginctl_LDADD = \
+loginctl_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS) \
        $(UDEV_LIBS)
 
 rootbin_PROGRAMS += \
-       systemd-loginctl
+       loginctl
 
 test_login_SOURCES = \
        src/login/test-login.c
@@ -1916,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
@@ -1993,9 +2000,9 @@ nodist_udevrules_DATA += \
        src/login/73-seat-late.rules
 
 MANPAGES += \
-       man/systemd-logind.conf.5 \
+       man/logind.conf.5 \
        man/sd-login.7 \
-       man/systemd-loginctl.1 \
+       man/loginctl.1 \
        man/sd_login_monitor_new.3 \
        man/sd_pid_get_session.3 \
        man/sd_uid_get_state.3 \
@@ -2248,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 && \
@@ -2413,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)