X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=798b4635ce0aca4ba9b63b0942df998075f51ad6;hp=03591bed15133627352efb86a18164bd9b5fffac;hb=634826b51b074b2e6d9314031bdd9abdcf862b54;hpb=7e4249b94e7f6edb9ffa842c3e790acee298594d diff --git a/Makefile.am b/Makefile.am index 03591bed1..798b4635c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,10 +48,14 @@ AM_CPPFLAGS = \ rootbin_PROGRAMS = \ systemd \ - systemctl + systemctl \ + systemd-notify -if HAVE_GTK bin_PROGRAMS = \ + systemd-install + +if HAVE_GTK +bin_PROGRAMS += \ systemadm endif @@ -64,7 +68,8 @@ noinst_PROGRAMS = \ test-engine \ test-job-type \ test-ns \ - test-loopback + test-loopback \ + test-daemon dist_dbuspolicy_DATA = \ src/org.freedesktop.systemd1.conf @@ -181,6 +186,20 @@ dist_systemunit_DATA += \ units/gentoo/xdm.service endif +if TARGET_ARCH +dist_systemunit_DATA += \ + units/arch/sysinit.service \ + units/arch/rc-local.service \ + units/arch/halt.service \ + units/arch/poweroff.service \ + units/arch/reboot.service +endif + +dist_doc_DATA = \ + README \ + src/sd-daemon.h \ + src/sd-daemon.c + # This is needed because automake is buggy in how it generates the # rules for C programs, but not Vala programs. We therefore can't # list the .h files as dependencies if we want make dist to work. @@ -199,6 +218,7 @@ COMMON_SOURCES = \ src/unit.c \ src/job.c \ src/manager.c \ + src/path-lookup.c \ src/load-fragment.c \ src/service.c \ src/automount.c \ @@ -236,7 +256,8 @@ COMMON_SOURCES = \ src/specifier.c \ src/unit-name.c \ src/fdset.c \ - src/namespace.c + src/namespace.c \ + src/tcpwrap.c EXTRA_DIST += \ ${COMMON_SOURCES:.c=.h} \ @@ -274,8 +295,8 @@ systemd_SOURCES = \ $(COMMON_SOURCES) \ src/main.c -systemd_CPPFLAGS = \ - $(AM_CPPFLAGS) \ +systemd_CFLAGS = \ + $(AM_CFLAGS) \ $(DBUS_CFLAGS) \ $(UDEV_CFLAGS) \ $(CGROUP_CFLAGS) @@ -283,20 +304,22 @@ systemd_CPPFLAGS = \ systemd_LDADD = \ $(DBUS_LIBS) \ $(UDEV_LIBS) \ - $(CGROUP_LIBS) + $(CGROUP_LIBS) \ + $(LIBWRAP_LIBS) \ + $(PAM_LIBS) test_engine_SOURCES = \ $(COMMON_SOURCES) \ src/test-engine.c -test_engine_CPPFLAGS = $(systemd_CPPFLAGS) +test_engine_CFLAGS = $(systemd_CFLAGS) test_engine_LDADD = $(systemd_LDADD) test_job_type_SOURCES = \ $(COMMON_SOURCES) \ src/test-job-type.c -test_job_type_CPPFLAGS = $(systemd_CPPFLAGS) +test_job_type_CFLAGS = $(systemd_CFLAGS) test_job_type_LDADD = $(systemd_LDADD) test_ns_SOURCES = \ @@ -304,7 +327,7 @@ test_ns_SOURCES = \ src/test-ns.c \ src/namespace.c -test_ns_CPPFLAGS = $(systemd_CPPFLAGS) +test_ns_CFLAGS = $(systemd_CFLAGS) test_ns_LDADD = $(systemd_LDADD) test_loopback_SOURCES = \ @@ -312,21 +335,27 @@ test_loopback_SOURCES = \ src/test-loopback.c \ src/loopback-setup.c -test_loopback_CPPFLAGS = $(systemd_CPPFLAGS) -test_loopback_LDADD = $(systemd_LDADD) +test_daemon_SOURCES = \ + $(BASIC_SOURCES) \ + src/test-daemon.c \ + src/sd-daemon.c systemd_logger_SOURCES = \ $(BASIC_SOURCES) \ src/logger.c \ - src/sd-daemon.c + src/sd-daemon.c \ + src/tcpwrap.c + +systemd_logger_LDADD = \ + $(LIBWRAP_LIBS) systemd_initctl_SOURCES = \ $(BASIC_SOURCES) \ src/initctl.c \ src/sd-daemon.c -systemd_initctl_CPPFLAGS = \ - $(AM_CPPFLAGS) \ +systemd_initctl_CFLAGS = \ + $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_initctl_LDADD = \ @@ -336,8 +365,8 @@ systemd_cgroups_agent_SOURCES = \ $(BASIC_SOURCES) \ src/cgroups-agent.c -systemd_cgroups_agent_CPPFLAGS = \ - $(AM_CPPFLAGS) \ +systemd_cgroups_agent_CFLAGS = \ + $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_cgroups_agent_LDADD = \ @@ -345,31 +374,44 @@ systemd_cgroups_agent_LDADD = \ systemctl_SOURCES = \ src/systemctl.c \ + src/utmp-wtmp.c \ $(BASIC_SOURCES) -systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) +systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) systemctl_LDADD = $(DBUS_LIBS) -VALAFLAGS = \ - -g \ - --save-temps \ - --pkg=dbus-glib-1 \ - --pkg=posix +systemd_notify_SOURCES = \ + src/notify.c \ + src/sd-daemon.c \ + $(BASIC_SOURCES) -if HAVE_GTK -VALAFLAGS += \ - --pkg=gtk+-2.0 -endif +systemd_install_SOURCES = \ + src/install.c \ + src/path-lookup.c \ + $(BASIC_SOURCES) -VALA_CFLAGS = \ - -Wno-unused-variable \ - -Wno-unused-function +# We don't really link here against D-Bus, however we indirectly include D-Bus header files +systemd_install_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) systemadm_SOURCES = \ src/systemadm.vala \ src/systemd-interfaces.vala -systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS) +systemadm_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUSGLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + -Wno-unused-variable \ + -Wno-unused-function \ + -Wno-shadow \ + -Wno-format-nonliteral + +systemadm_VALAFLAGS = \ + --pkg=dbus-glib-1 \ + --pkg=posix \ + --pkg=gtk+-2.0 \ + -g + systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS) SED_PROCESS = \ @@ -423,20 +465,20 @@ endif if HAVE_XSLTPROC XSLTPROC_PROCESS_MAN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + $(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< XSLTPROC_PROCESS_MAN_IN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \ + $(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \ mv ${@:.in=} $@ XSLTPROC_PROCESS_HTML = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< + $(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< XSLTPROC_PROCESS_HTML_IN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \ + $(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \ mv ${@:.in=} $@ man/%.5: man/%.xml