X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f63b3e4f8fec52bb6d7a680525af0a7c9debe49e;hb=11857f8daf5a6336865844dedff365f9fa22c8f4;hp=57a2dd98dd9be7aa76ea8b4f3f0f756c61df14d0;hpb=8e27452380193a5f81bfd08a59aab8b07008ba0b;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 57a2dd98d..f63b3e4f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,8 @@ AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \ - -DSYSTEM_SYSVINIT_PATH=\"$(sysconfdir)/init.d\" \ + -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ + -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \ -DSESSION_DATA_UNIT_PATH=\"$(pkgdatadir)/session\" \ -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" @@ -37,7 +38,8 @@ bin_PROGRAMS = \ pkglibexec_PROGRAMS = \ systemd-logger \ - systemd-cgroups-agent + systemd-cgroups-agent \ + systemd-initctl noinst_PROGRAMS = \ test-engine \ @@ -137,6 +139,17 @@ systemd_logger_SOURCES = \ $(BASIC_SOURCES) \ logger.c +systemd_initctl_SOURCES = \ + $(BASIC_SOURCES) \ + initctl.c + +systemd_initctl_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(DBUS_CFLAGS) + +systemd_initctl_LDADD = \ + $(DBUS_LIBS) + systemd_cgroups_agent_SOURCES = \ $(BASIC_SOURCES) \ cgroups-agent.c