X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a2f7e1725ed975a3a750acea6111b463de55049a;hp=b444c02f3026e6ce37ed464866675e07b530d7c2;hb=490ebb027d4ca2b26f1ed2a93cdac67460eb1eb5;hpb=a822056bca49a63cb832230af22f789c5ab5b856 diff --git a/Makefile.am b/Makefile.am index b444c02f3..a2f7e1725 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ AM_CPPFLAGS = \ -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ -DRUNTIME_DIR=\"$(localstatedir)/run\" \ + -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ -I $(top_srcdir)/src rootbin_PROGRAMS = \ @@ -58,7 +59,7 @@ rootbin_PROGRAMS = \ systemd-notify bin_PROGRAMS = \ - systemd-install + systemd-cgls if HAVE_GTK bin_PROGRAMS += \ @@ -68,7 +69,12 @@ endif rootlibexec_PROGRAMS = \ systemd-logger \ systemd-cgroups-agent \ - systemd-initctl + systemd-initctl \ + systemd-update-utmp \ + systemd-random-seed \ + systemd-shutdownd \ + systemd-auto-console-getty \ + systemd-modules-load noinst_PROGRAMS = \ test-engine \ @@ -76,7 +82,8 @@ noinst_PROGRAMS = \ test-ns \ test-loopback \ test-daemon \ - test-cgroup + test-cgroup \ + test-env-replace if HAVE_PAM pamlib_LTLIBRARIES = \ @@ -112,6 +119,7 @@ dbusinterface_DATA = \ dist_systemunit_DATA = \ units/emergency.service \ + units/emergency.target \ units/basic.target \ units/getty.target \ units/halt.target \ @@ -125,11 +133,14 @@ dist_systemunit_DATA = \ units/rpcbind.target \ units/rtc-set.target \ units/shutdown.target \ + units/umount.target \ units/sigpwr.target \ units/sockets.target \ units/swap.target \ + units/dbus.target \ units/systemd-initctl.socket \ units/systemd-logger.socket \ + units/systemd-shutdownd.socket \ units/dev-hugepages.automount \ units/dev-hugepages.mount \ units/dev-mqueue.automount \ @@ -140,8 +151,17 @@ dist_systemunit_DATA = \ units/sys-kernel-debug.mount \ units/sys-kernel-security.automount \ units/sys-kernel-security.mount \ + units/tmp.mount \ units/var-lock.mount \ - units/var-run.mount + units/var-lock.service \ + units/var-run.mount \ + units/var-run.service \ + units/hwclock-load.service \ + units/hwclock-save.service \ + units/sysctl.service \ + units/printer.target \ + units/bluetooth.target \ + units/smartcard.target nodist_systemunit_DATA = \ units/sysinit.target \ @@ -151,8 +171,14 @@ nodist_systemunit_DATA = \ units/multi-user.target \ units/systemd-initctl.service \ units/systemd-logger.service \ - units/syslog.target \ - units/dbus.target + units/systemd-shutdownd.service \ + units/systemd-auto-console-getty.service \ + units/systemd-modules-load.service \ + units/systemd-update-utmp-runlevel.service \ + units/systemd-update-utmp-shutdown.service \ + units/systemd-random-seed-save.service \ + units/systemd-random-seed-load.service \ + units/syslog.target dist_sessionunit_DATA = \ units/session/default.target @@ -169,8 +195,14 @@ EXTRA_DIST = \ units/remote-fs.target.m4 \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ + units/systemd-shutdownd.service.in \ + units/systemd-auto-console-getty.service.in \ + units/systemd-modules-load.service.in \ + units/systemd-update-utmp-runlevel.service.in \ + units/systemd-update-utmp-shutdown.service.in \ + units/systemd-random-seed-save.service.in \ + units/systemd-random-seed-load.service.in \ units/syslog.target.in \ - units/dbus.target.in \ units/session/exit.service.in \ systemd.pc.in @@ -182,14 +214,20 @@ dist_systemunit_DATA += \ units/fedora/prefdm.service \ units/fedora/rc-local.service \ units/fedora/reboot.service \ - units/fedora/sysinit.service + units/fedora/sysinit.service \ + units/fedora/single.service \ + units/fedora/plymouth-quit.service \ + units/fedora/plymouth-reboot.service \ + units/fedora/plymouth-poweroff.service \ + units/fedora/plymouth-halt.service endif if TARGET_SUSE dist_systemunit_DATA += \ units/suse/halt.service \ units/suse/poweroff.service \ - units/suse/reboot.service + units/suse/reboot.service \ + units/suse/fsck.target endif if TARGET_GENTOO @@ -226,6 +264,7 @@ noinst_LTLIBRARIES = \ libsystemd_basic_la_SOURCES = \ src/util.c \ + src/label.c \ src/hashmap.c \ src/set.c \ src/strv.c \ @@ -234,6 +273,13 @@ libsystemd_basic_la_SOURCES = \ src/log.c \ src/ratelimit.c +libsystemd_basic_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) + +libsystemd_basic_la_LIBADD = \ + $(SELINUX_LIBS) + libsystemd_core_la_SOURCES = \ src/unit.c \ src/job.c \ @@ -272,8 +318,6 @@ libsystemd_core_la_SOURCES = \ src/hostname-setup.c \ src/loopback-setup.c \ src/kmod-setup.c \ - src/modprobe-setup.c \ - src/utmp-wtmp.c \ src/specifier.c \ src/unit-name.c \ src/fdset.c \ @@ -285,15 +329,17 @@ libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) \ $(UDEV_CFLAGS) \ - $(CGROUP_CFLAGS) + $(LIBWRAP_CFLAGS) \ + $(PAM_CFLAGS) \ + $(AUDIT_CFLAGS) libsystemd_core_la_LIBADD = \ libsystemd-basic.la \ $(DBUS_LIBS) \ $(UDEV_LIBS) \ - $(CGROUP_LIBS) \ $(LIBWRAP_LIBS) \ - $(PAM_LIBS) + $(PAM_LIBS) \ + $(AUDIT_LIBS) # This is needed because automake is buggy in how it generates the # rules for C programs, but not Vala programs. We therefore can't @@ -311,13 +357,18 @@ EXTRA_DIST += \ src/initreq.h \ src/sd-daemon.h \ src/special.h \ - src/dbus-common.h + src/dbus-common.h \ + src/bus-errors.h \ + src/cgroup-show.h \ + src/utmp-wtmp.h \ + src/build.h \ + src/shutdownd.h MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ man/systemadm.1 \ - man/systemd-install.1 \ + man/systemd-cgls.1 \ man/systemd-notify.1 \ man/sd_notify.3 \ man/sd_booted.3 \ @@ -392,8 +443,7 @@ systemd_SOURCES = \ systemd_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) \ - $(CGROUP_CFLAGS) + $(UDEV_CFLAGS) systemd_LDADD = \ libsystemd-core.la @@ -435,12 +485,19 @@ test_cgroup_SOURCES = \ src/cgroup-util.c test_cgroup_CFLAGS = \ - $(AM_CFLAGS) \ - $(CGROUP_CFLAGS) + $(AM_CFLAGS) test_cgroup_LDADD = \ - libsystemd-basic.la \ - $(CGROUP_LIBS) + libsystemd-basic.la + +test_env_replace_SOURCES = \ + src/test-env-replace.c + +test_env_replace_CFLAGS = \ + $(AM_CFLAGS) + +test_env_replace_LDADD = \ + libsystemd-basic.la systemd_logger_SOURCES = \ src/logger.c \ @@ -464,8 +521,65 @@ systemd_initctl_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) +systemd_update_utmp_SOURCES = \ + src/update-utmp.c \ + src/dbus-common.c \ + src/utmp-wtmp.c + +systemd_update_utmp_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(AUDIT_CFLAGS) + +systemd_update_utmp_LDADD = \ + libsystemd-basic.la \ + $(DBUS_LIBS) \ + $(AUDIT_LIBS) + +systemd_random_seed_SOURCES = \ + src/random-seed.c + +systemd_random_seed_CFLAGS = \ + $(AM_CFLAGS) + +systemd_random_seed_LDADD = \ + libsystemd-basic.la + +systemd_shutdownd_SOURCES = \ + src/utmp-wtmp.c \ + src/sd-daemon.c \ + src/shutdownd.c + +systemd_shutdownd_CFLAGS = \ + $(AM_CFLAGS) + +systemd_shutdownd_LDADD = \ + libsystemd-basic.la + +systemd_auto_console_getty_SOURCES = \ + src/auto-console-getty.c \ + src/dbus-common.c + +systemd_auto_console_getty_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +systemd_auto_console_getty_LDADD = \ + libsystemd-basic.la \ + $(DBUS_LIBS) + +systemd_modules_load_SOURCES = \ + src/modules-load.c + +systemd_modules_load_CFLAGS = \ + $(AM_CFLAGS) + +systemd_modules_load_LDADD = \ + libsystemd-basic.la + systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent.c + src/cgroups-agent.c \ + src/dbus-common.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ @@ -478,7 +592,11 @@ systemd_cgroups_agent_LDADD = \ systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ - src/dbus-common.c + src/dbus-common.c \ + src/path-lookup.c \ + src/sd-daemon.c \ + src/cgroup-show.c \ + src/cgroup-util.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -495,18 +613,16 @@ systemd_notify_SOURCES = \ systemd_notify_LDADD = \ libsystemd-basic.la -systemd_install_SOURCES = \ - src/install.c \ - src/path-lookup.c \ - src/dbus-common.c +systemd_cgls_SOURCES = \ + src/cgls.c \ + src/cgroup-show.c \ + src/cgroup-util.c -systemd_install_LDADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) +systemd_cgls_CFLAGS = \ + $(AM_CFLAGS) -systemd_install_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) +systemd_cgls_LDADD = \ + libsystemd-basic.la systemadm_SOURCES = \ src/systemadm.vala \ @@ -537,8 +653,7 @@ pam_systemd_la_SOURCES = \ src/sd-daemon.c pam_systemd_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(CGROUP_CFLAGS) \ + $(AM_CFLAGS) -fvisibility=hidden pam_systemd_la_LDFLAGS = \ @@ -550,14 +665,12 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-basic.la \ - $(PAM_LIBS) \ - $(CGROUP_LIBS) + $(PAM_LIBS) SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \ - -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ @@ -670,7 +783,7 @@ CLEANFILES += \ endif org.freedesktop.systemd1.%.xml: systemd - $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@ + $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@ CLEANFILES += \ $(dbusinterface_DATA) @@ -681,6 +794,12 @@ install-data-hook: $(DESTDIR)$(sessionunitdir) \ $(DESTDIR)$(systemunitdir)/sockets.target.wants \ $(DESTDIR)$(systemunitdir)/sysinit.target.wants \ + $(DESTDIR)$(systemunitdir)/shutdown.target.wants \ + $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \ + $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \ + $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \ + $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \ + $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system \ $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \ @@ -693,38 +812,59 @@ install-data-hook: rm -f session && \ $(LN_S) $(pkgsysconfdir)/session session ) ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \ - rm -f systemd-initctl.socket systemd-logger.socket && \ + rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \ $(LN_S) ../systemd-logger.socket systemd-logger.socket && \ - $(LN_S) ../systemd-initctl.socket systemd-initctl.socket ) + $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \ + $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket ) + ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \ + rm -f systemd-update-utmp-runlevel.service && \ + $(LN_S) ../systemd-update-utmp-runlevel.service ) + ( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \ + rm -f systemd-update-utmp-runlevel.service && \ + $(LN_S) ../systemd-update-utmp-runlevel.service ) + ( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \ + rm -f systemd-update-utmp-runlevel.service && \ + $(LN_S) ../systemd-update-utmp-runlevel.service ) + ( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \ + rm -f systemd-update-utmp-runlevel.service && \ + $(LN_S) ../systemd-update-utmp-runlevel.service ) + ( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \ + rm -f systemd-update-utmp-runlevel.service && \ + $(LN_S) ../systemd-update-utmp-runlevel.service ) + ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \ + rm -f systemd-update-utmp-shutdown.service && \ + $(LN_S) ../systemd-update-utmp-shutdown.service ) ( cd $(DESTDIR)$(sessionunitdir) && \ - rm -f shutdown.target sockets.target local-fs.target swap.target && \ + rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ $(LN_S) $(systemunitdir)/sockets.target sockets.target && \ $(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \ - $(LN_S) $(systemunitdir)/swap.target swap.target ) + $(LN_S) $(systemunitdir)/swap.target swap.target && \ + $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \ + $(LN_S) $(systemunitdir)/printer.target printer.target) ( cd $(DESTDIR)$(systemunitdir) && \ - rm -f runlevel0.target runlevel1.target runlevel6.target && \ + rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \ $(LN_S) poweroff.target runlevel0.target && \ $(LN_S) rescue.target runlevel1.target && \ + $(LN_S) multi-user.target runlevel2.target && \ + $(LN_S) multi-user.target runlevel3.target && \ + $(LN_S) multi-user.target runlevel4.target && \ + $(LN_S) graphical.target runlevel5.target && \ $(LN_S) reboot.target runlevel6.target ) ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f default.target ctrl-alt-del.target kbrequest.target && \ $(LN_S) $(systemunitdir)/graphical.target default.target && \ $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \ - $(LN_S) $(systemunitdir)/rescue.target kbrequest.target && \ - rm -f runlevel2.target runlevel3.target runlevel4.target runlevel5.target && \ - $(LN_S) $(systemunitdir)/multi-user.target runlevel2.target && \ - $(LN_S) $(systemunitdir)/multi-user.target runlevel3.target && \ - $(LN_S) $(systemunitdir)/multi-user.target runlevel4.target && \ - $(LN_S) $(systemunitdir)/graphical.target runlevel5.target ) + $(LN_S) $(systemunitdir)/rescue.target kbrequest.target ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \ - rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \ + rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service systemd-auto-console-getty.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \ - $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service ) + $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service && \ + $(LN_S) $(systemunitdir)/systemd-auto-console-getty.service systemd-auto-console-getty.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ rm -f getty.target remote-fs.target && \ $(LN_S) $(systemunitdir)/getty.target getty.target && \ @@ -745,16 +885,36 @@ install-data-hook: $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) if TARGET_FEDORA $(MKDIR_P) -m 0755 \ - $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) + $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \ + $(DESTDIR)$(systemunitdir)/reboot.target.wants \ + $(DESTDIR)$(systemunitdir)/poweroff.target.wants \ + $(DESTDIR)$(systemunitdir)/halt.target.wants \ + $(DESTDIR)$(systemunitdir)/rescue.target.wants \ + $(DESTDIR)$(systemunitdir)/multi-user.target.wants ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f display-manager.service && \ $(LN_S) $(systemunitdir)/prefdm.service display-manager.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \ rm -f prefdm.service && \ - $(LN_S) ../prefdm.service prefdm.service ) + $(LN_S) $(systemunitdir)/prefdm.service prefdm.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ rm -f rc-local.service && \ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service ) + ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \ + rm -f single.service && \ + $(LN_S) $(systemunitdir)/single.service single.service ) + ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ + rm -f plymouth-quit.service && \ + $(LN_S) ../plymouth-quit.service plymouth-quit.service ) + ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \ + rm -f plymouth-reboot.service && \ + $(LN_S) ../plymouth-reboot.service plymouth-reboot.service ) + ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \ + rm -f plymouth-poweroff.service && \ + $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service ) + ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \ + rm -f plymouth-halt.service && \ + $(LN_S) ../plymouth-halt.service plymouth-halt.service ) ( cd $(DESTDIR)$(systemunitdir) && \ rm -f local.service && \ $(LN_S) rc-local.service local.service ) @@ -766,8 +926,13 @@ if TARGET_GENTOO rm -f display-manager.service && \ $(LN_S) $(systemunitdir)/xdm.service display-manager.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \ - rm -f prefdm.service && \ - $(LN_S) ../prefdm.service prefdm.service ) + rm -f xdm.service && \ + $(LN_S) $(systemunitdir)/xdm.service xdm.service ) +endif +if !TARGET_SUSE + ( cd $(DESTDIR)$(systemunitdir) && \ + rm -f fsck.target && \ + $(LN_S) sysinit.target fsck.target ) endif DISTCHECK_CONFIGURE_FLAGS = \ @@ -778,3 +943,11 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-rootdir=$$dc_install_base/$(rootdir) + +upload: all distcheck + cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/ + scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/ + scp man/*.html tango:public/systemd-man/ + +git-tag: + git tag "v$(VERSION)" -m "systemd $(VERSION)"