X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=219d8ded8e6115c14f63f2dd8c24e440bb49f420;hp=0b2660ae5fcea3caca4c0b0aaa7b135c6b7ebeab;hb=6070fe66ac2f317e7e85e5685f0916d1e2b73a28;hpb=b47ffcfdfd46de119e0fe8d1c48105bd7c21ddd4 diff --git a/Makefile.am b/Makefile.am index 0b2660ae5..219d8ded8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = po LIBSYSTEMD_LOGIN_CURRENT=2 -LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_REVISION=1 LIBSYSTEMD_LOGIN_AGE=2 LIBSYSTEMD_DAEMON_CURRENT=0 @@ -29,11 +29,11 @@ LIBSYSTEMD_DAEMON_REVISION=1 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=2 +LIBSYSTEMD_ID128_REVISION=3 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=0 -LIBSYSTEMD_JOURNAL_REVISION=2 +LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=0 # Dirs of external packages @@ -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\" \ @@ -177,12 +180,6 @@ bin_PROGRAMS = \ dist_bin_SCRIPTS = \ src/systemd-analyze -if HAVE_GTK -bin_PROGRAMS += \ - systemadm \ - systemd-gnome-ask-password-agent -endif - rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ @@ -291,10 +288,8 @@ dist_systemunit_DATA = \ units/dev-mqueue.mount \ units/sys-kernel-config.mount \ units/sys-kernel-debug.mount \ - units/sys-kernel-security.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 \ @@ -306,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 \ @@ -517,6 +507,7 @@ libsystemd_core_la_SOURCES = \ src/mount-setup.c \ src/hostname-setup.c \ src/selinux-setup.c \ + src/ima-setup.c \ src/loopback-setup.c \ src/kmod-setup.c \ src/locale-setup.c \ @@ -651,12 +642,13 @@ 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 \ man/systemctl.1 \ - man/systemadm.1 \ man/systemd-cgls.1 \ man/systemd-cgtop.1 \ man/systemd-nspawn.1 \ @@ -693,8 +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-machine-id-setup.1 \ + man/journald.conf.5 \ + man/journalctl.1 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -705,20 +698,23 @@ man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 +XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} + if ENABLE_MANPAGES -dist_man_MANS = \ +man_MANS = \ $(MANPAGES) \ $(MANPAGES_ALIAS) -XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} - -dist_noinst_DATA = \ +noinst_DATA = \ ${XML_FILES:.xml=.html} +endif EXTRA_DIST += \ - $(XML_FILES) -endif + $(XML_FILES) \ + ${XML_FILES:.xml=.html} \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) systemd_SOURCES = \ src/main.c @@ -1032,52 +1028,6 @@ systemd_stdio_bridge_SOURCES = \ systemd_stdio_bridge_LDADD = \ libsystemd-basic.la -systemadm_SOURCES = \ - src/systemadm.vala \ - src/systemd-interfaces.vala \ - src/wraplabel.vala - -systemadm_CFLAGS = \ - $(AM_CFLAGS) \ - $(GTK_CFLAGS) \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-shadow \ - -Wno-format-nonliteral - -systemadm_VALAFLAGS = \ - --pkg=posix \ - --pkg=gtk+-2.0 \ - --pkg=gee-1.0 \ - -g - -systemadm_LDADD = \ - $(GTK_LIBS) - -systemd_gnome_ask_password_agent_SOURCES = \ - src/gnome-ask-password-agent.vala - -systemd_gnome_ask_password_agent_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(GTK_CFLAGS) \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-shadow \ - -Wno-format-nonliteral - -systemd_gnome_ask_password_agent_VALAFLAGS = \ - --pkg=posix \ - --pkg=gtk+-2.0 \ - --pkg=linux \ - --pkg=gio-unix-2.0 \ - --pkg=libnotify \ - -g - -systemd_gnome_ask_password_agent_LDADD = \ - $(LIBNOTIFY_LIBS) \ - $(GTK_LIBS) - systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent.c \ src/ask-password-api.c \ @@ -1254,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 @@ -1297,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 \ @@ -1347,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 \ @@ -1360,7 +1318,7 @@ rootlibexec_PROGRAMS += \ systemd-journald rootbin_PROGRAMS += \ - systemd-journalctl + journalctl bin_PROGRAMS += \ systemd-cat @@ -1372,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 @@ -1860,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 \ @@ -1868,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 @@ -1965,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 @@ -2042,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 \ @@ -2188,11 +2146,6 @@ CLEANFILES += \ src/load-fragment-gperf-nulstr.c \ src/99-systemd.rules -if HAVE_VALAC -CLEANFILES += \ - ${systemadm_SOURCES:.vala=.c} -endif - if HAVE_XSLTPROC XSLTPROC_FLAGS = \ --nonet \ @@ -2302,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 && \ @@ -2345,7 +2296,6 @@ systemd-install-data-hook: dev-mqueue.mount \ sys-kernel-config.mount \ sys-kernel-debug.mount \ - sys-kernel-security.mount \ sys-fs-fuse-connections.mount \ systemd-modules-load.service \ systemd-tmpfiles-setup.service \ @@ -2355,7 +2305,6 @@ systemd-install-data-hook: $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \ $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \ $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \ - $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \ $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ @@ -2469,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) @@ -2488,8 +2431,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ - --with-rootprefix=$$dc_install_base/$(prefix) - + --with-rootprefix=$$dc_install_base \ + --disable-split-usr upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/