X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=26412ab304f5a3c4f440786315f672f2de83e74d;hp=349316aa3ff3956875dfdc81d289d00b204ab97c;hb=7640a5de1b3ffe6547200ad204d14e4f067caf4f;hpb=c91faef3b3facfdf13282aee957af25dd555890b diff --git a/Makefile.am b/Makefile.am index 349316aa3..26412ab30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,18 +30,17 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd -userunitdir=$(pkgdatadir)/user +userunitdir=$(prefix)/lib/systemd/user tmpfilesdir=$(sysconfdir)/tmpfiles.d usergeneratordir=$(pkglibexecdir)/user-generators # And these are the special ones for / rootdir=@rootdir@ rootbindir=$(rootdir)/bin -rootsbindir=$(rootdir)/sbin rootlibexecdir=$(rootdir)/lib/systemd +systemgeneratordir=$(rootlibexecdir)/system-generators +systemshutdowndir=$(rootlibexecdir)/system-shutdown systemunitdir=$(rootdir)/lib/systemd/system -systemgeneratordir=$(rootdir)/lib/systemd/system-generators -systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -145,7 +144,8 @@ rootlibexec_PROGRAMS = \ systemd-ac-power \ systemd-detect-virt \ systemd-sysctl \ - systemd-binfmt + systemd-binfmt \ + systemd-hostnamed systemgenerator_PROGRAMS = \ systemd-getty-generator @@ -178,10 +178,12 @@ dist_pkgsysconf_DATA = \ src/system.conf dist_dbuspolicy_DATA = \ - src/org.freedesktop.systemd1.conf + src/org.freedesktop.systemd1.conf \ + src/org.freedesktop.hostname1.conf dist_dbussystemservice_DATA = \ - src/org.freedesktop.systemd1.service + src/org.freedesktop.systemd1.service \ + src/org.freedesktop.hostname1.service dist_udevrules_DATA = \ src/99-systemd.rules @@ -233,7 +235,7 @@ dist_systemunit_DATA = \ units/reboot.target \ units/rescue.target \ units/rpcbind.target \ - units/rtc-set.target \ + units/time-sync.target \ units/shutdown.target \ units/final.target \ units/umount.target \ @@ -275,7 +277,6 @@ dist_systemunit_DATA += \ units/var-lock.mount endif - nodist_systemunit_DATA = \ units/getty@.service \ units/serial-getty@.service \ @@ -284,6 +285,7 @@ nodist_systemunit_DATA = \ units/systemd-initctl.service \ units/systemd-logger.service \ units/systemd-shutdownd.service \ + units/systemd-hostnamed.service \ units/systemd-kmsg-syslogd.service \ units/systemd-modules-load.service \ units/systemd-vconsole-setup.service \ @@ -328,6 +330,7 @@ EXTRA_DIST = \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ units/systemd-shutdownd.service.in \ + units/systemd-hostnamed.service.in \ units/systemd-kmsg-syslogd.service.in \ units/systemd-modules-load.service.in \ units/systemd-vconsole-setup.service.in \ @@ -408,9 +411,12 @@ dist_doc_DATA = \ pkgconfigdata_DATA = \ systemd.pc -polkitpolicy_DATA = \ +nodist_polkitpolicy_DATA = \ src/org.freedesktop.systemd1.policy +dist_polkitpolicy_DATA = \ + src/org.freedesktop.hostname1.policy + noinst_LTLIBRARIES = \ libsystemd-basic.la \ libsystemd-core.la \ @@ -483,7 +489,8 @@ libsystemd_core_la_SOURCES = \ src/namespace.c \ src/tcpwrap.c \ src/cgroup-util.c \ - src/condition.c + src/condition.c \ + src/dbus-common.c libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -572,9 +579,11 @@ MANPAGES = \ man/vconsole.conf.5 \ man/locale.conf.5 \ man/os-release.5 \ + man/machine-info.5 \ man/modules-load.d.5 \ - man/binfmt.d.5 \ - man/sysctl.d.5 + man/binfmt.d.5 \ + man/sysctl.d.5 \ + man/systemd-ask-password.1 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -754,6 +763,19 @@ systemd_shutdownd_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la +systemd_hostnamed_SOURCES = \ + src/hostnamed.c \ + src/dbus-common.c + +systemd_hostnamed_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +systemd_hostnamed_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(DBUS_LIBS) + systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ @@ -1130,7 +1152,9 @@ SED_PROCESS = \ -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ + -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ -e 's,@systemunitdir\@,$(systemunitdir),g' \ + -e 's,@userunitdir\@,$(userunitdir),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ @@ -1319,13 +1343,11 @@ install-data-hook: fsck-root.service \ remount-rootfs.service \ var-run.mount \ - var-lock.mount \ media.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) ../var-lock.mount var-lock.mount && \ $(LN_S) ../media.mount media.mount ) ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \ @@ -1346,9 +1368,10 @@ install-data-hook: $(LN_S) graphical.target runlevel5.target && \ $(LN_S) reboot.target runlevel6.target ) ( cd $(DESTDIR)$(systemunitdir) && \ - rm -f default.target ctrl-alt-del.target && \ + rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service && \ $(LN_S) graphical.target default.target && \ - $(LN_S) reboot.target ctrl-alt-del.target ) + $(LN_S) reboot.target ctrl-alt-del.target && \ + $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service ) ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \ $(LN_S) ../getty.target getty.target && \ @@ -1473,6 +1496,12 @@ if TARGET_DEBIAN_OR_UBUNTU $(LN_S) multi-user.target runlevel5.target ) 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 + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \