X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=03591bed15133627352efb86a18164bd9b5fffac;hb=7e4249b94e7f6edb9ffa842c3e790acee298594d;hp=5f880afe0045be08336c09f36474bd39b456152f;hpb=8c4a3079a7f358c179430d1aec59de8b670b5f6e;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 5f880afe0..03591bed1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,11 @@ ACLOCAL_AMFLAGS = -I m4 # Dirs of external packages -dbuspolicydir=$(sysconfdir)/dbus-1/system.d +dbuspolicydir=@dbuspolicydir@ +dbussessionservicedir=@dbussessionservicedir@ +dbussystemservicedir=@dbussystemservicedir@ +dbusinterfacedir=@dbusinterfacedir@ udevrulesdir=@udevrulesdir@ -interfacedir=$(datadir)/dbus-1/interfaces # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd @@ -28,7 +30,6 @@ sessionunitdir=$(pkgdatadir)/session # And these are the special ones for / rootdir=@rootdir@ -rootsbindir=$(rootdir)/sbin rootbindir=$(rootdir)/bin rootlibexecdir=$(rootdir)/lib/systemd systemunitdir=$(rootdir)/lib/systemd/system @@ -42,13 +43,11 @@ AM_CPPFLAGS = \ -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \ -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \ -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ - -DSYSTEMD_BINARY_PATH=\"$(rootsbindir)/systemd\" \ + -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \ -I $(top_srcdir)/src -rootsbin_PROGRAMS = \ - systemd - rootbin_PROGRAMS = \ + systemd \ systemctl if HAVE_GTK @@ -70,10 +69,13 @@ noinst_PROGRAMS = \ dist_dbuspolicy_DATA = \ src/org.freedesktop.systemd1.conf +dist_dbussystemservice_DATA = \ + src/org.freedesktop.systemd1.service + dist_udevrules_DATA = \ src/99-systemd.rules -interface_DATA = \ +dbusinterface_DATA = \ org.freedesktop.systemd1.Manager.xml \ org.freedesktop.systemd1.Job.xml \ org.freedesktop.systemd1.Unit.xml \ @@ -90,6 +92,7 @@ interface_DATA = \ dist_systemunit_DATA = \ units/emergency.service \ + units/basic.target \ units/getty.target \ units/halt.target \ units/local-fs.target \ @@ -122,7 +125,7 @@ dist_systemunit_DATA = \ units/var-run.mount systemunit_DATA = \ - units/basic.target \ + units/sysinit.target \ units/getty@.service \ units/graphical.target \ units/multi-user.target \ @@ -138,7 +141,7 @@ sessionunit_DATA = \ units/session/exit.service EXTRA_DIST = \ - units/basic.target.m4 \ + units/sysinit.target.m4 \ units/getty@.service.m4 \ units/graphical.target.m4 \ units/multi-user.target.m4 \ @@ -162,6 +165,13 @@ dist_systemunit_DATA += \ units/fedora/sysinit.service endif +if TARGET_SUSE +dist_systemunit_DATA += \ + units/suse/halt.service \ + units/suse/poweroff.service \ + units/suse/reboot.service +endif + if TARGET_GENTOO dist_systemunit_DATA += \ units/gentoo/halt.service \ @@ -284,7 +294,7 @@ test_engine_LDADD = $(systemd_LDADD) test_job_type_SOURCES = \ $(COMMON_SOURCES) \ - src/test-engine.c + src/test-job-type.c test_job_type_CPPFLAGS = $(systemd_CPPFLAGS) test_job_type_LDADD = $(systemd_LDADD) @@ -333,6 +343,13 @@ systemd_cgroups_agent_CPPFLAGS = \ systemd_cgroups_agent_LDADD = \ $(DBUS_LIBS) +systemctl_SOURCES = \ + src/systemctl.c \ + $(BASIC_SOURCES) + +systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) +systemctl_LDADD = $(DBUS_LIBS) + VALAFLAGS = \ -g \ --save-temps \ @@ -348,13 +365,6 @@ VALA_CFLAGS = \ -Wno-unused-variable \ -Wno-unused-function -systemctl_SOURCES = \ - src/systemctl.vala \ - src/systemd-interfaces.vala - -systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS) -systemctl_LDADD = $(DBUSGLIB_LIBS) - systemadm_SOURCES = \ src/systemadm.vala \ src/systemd-interfaces.vala @@ -364,11 +374,10 @@ systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS) SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \ - -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ + $(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\@,$(bindir)/systemctl,g' \ + -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ < $< > $@ units/%: units/%.in Makefile @@ -395,7 +404,7 @@ CLEANFILES = \ units/systemd-initctl.service \ units/systemd-logger.service \ units/syslog.target \ - units/basic.target \ + units/sysinit.target \ units/getty@.service \ units/graphical.target \ units/multi-user.target \ @@ -408,7 +417,6 @@ CLEANFILES = \ if HAVE_VALAC CLEANFILES += \ src/systemd-interfaces.c \ - src/systemctl.c \ src/systemadm.c endif @@ -460,14 +468,14 @@ endif org.freedesktop.systemd1.%.xml: systemd $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@ -CLEANFILES += $(interface_DATA) +CLEANFILES += $(dbusinterface_DATA) install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(systemunitdir) \ $(DESTDIR)$(sessionunitdir) \ $(DESTDIR)$(systemunitdir)/sockets.target.wants \ - $(DESTDIR)$(systemunitdir)/basic.target.wants \ + $(DESTDIR)$(systemunitdir)/sysinit.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system \ $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \ @@ -513,9 +521,10 @@ install-data-hook: $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \ $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ - rm -f getty.target && \ - $(LN_S) $(systemunitdir)/getty.target getty.target ) - ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \ + rm -f getty.target remote-fs.target && \ + $(LN_S) $(systemunitdir)/getty.target getty.target && \ + $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target ) + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ rm -f dev-hugepages.automount \ dev-mqueue.automount \ proc-sys-fs-binfmt_misc.automount \ @@ -526,6 +535,9 @@ install-data-hook: $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \ $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount ) + ( cd $(DESTDIR)$(dbussessionservicedir) && \ + rm -f org.freedesktop.systemd1.service && \ + $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) if TARGET_FEDORA ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f display-manager.service && \ @@ -552,5 +564,9 @@ if TARGET_GENTOO endif DISTCHECK_CONFIGURE_FLAGS = \ + --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ + --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ + --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \ + --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-rootdir=$$dc_install_base/$(rootdir)