X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=115cd0530f2933e9d6970b489e2d6d45c5918d10;hb=6e620becc8543e9ea8381fcd779dd932c2464749;hp=7afa2f1576c5df099b868442e545c755ee783194;hpb=15ae422b7471cf6f41ccf450243d8afd8ea0a054;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 7afa2f157..115cd0530 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,8 @@ pkglibexec_PROGRAMS = \ noinst_PROGRAMS = \ test-engine \ test-job-type \ - test-ns + test-ns \ + test-loopback dbuspolicy_DATA = \ org.freedesktop.systemd1.conf @@ -77,7 +78,7 @@ EXTRA_DIST = \ units/systemd-logger.service.in \ units/systemd-logger.socket -BASIC_SOURCES= \ +BASIC_SOURCES = \ util.c \ util.h \ hashmap.c \ @@ -95,7 +96,7 @@ BASIC_SOURCES= \ ratelimit.c \ ratelimit.h -COMMON_SOURCES= \ +COMMON_SOURCES = \ $(BASIC_SOURCES) \ unit.c \ unit.h \ @@ -111,6 +112,8 @@ COMMON_SOURCES= \ automount.h \ mount.c \ mount.h \ + swap.c \ + swap.h \ device.c \ device.h \ target.c \ @@ -143,6 +146,8 @@ COMMON_SOURCES= \ dbus-mount.h \ dbus-automount.c \ dbus-autpmount.h \ + dbus-swap.c \ + dbus-swap.h \ dbus-snapshot.c \ dbus-snapshot.h \ dbus-device.c \ @@ -155,6 +160,8 @@ COMMON_SOURCES= \ mount-setup.h \ hostname-setup.c \ hostname-setup.h \ + loopback-setup.c \ + loopback-setup.h \ utmp-wtmp.c \ utmp-wtmp.h \ specifier.c \ @@ -203,6 +210,14 @@ test_ns_SOURCES = \ test_ns_CPPFLAGS = $(systemd_CPPFLAGS) test_ns_LDADD = $(systemd_LDADD) +test_loopback_SOURCES = \ + $(BASIC_SOURCES) \ + test-loopback.c \ + loopback-setup.c + +test_loopback_CPPFLAGS = $(systemd_CPPFLAGS) +test_loopback_LDADD = $(systemd_LDADD) + systemd_logger_SOURCES = \ $(BASIC_SOURCES) \ logger.c @@ -229,7 +244,7 @@ systemd_cgroups_agent_CPPFLAGS = \ systemd_cgroups_agent_LDADD = \ $(DBUS_LIBS) -VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gee-1.0 --pkg gtk+-2.0 +VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gtk+-2.0 systemctl_SOURCES = \ systemctl.vala \ @@ -246,10 +261,14 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS) systemd-initctl.service: units/systemd-initctl.service.in Makefile - sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@ + sed -e 's,@libexecdir\@,$(libexecdir),g' \ + -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ + < $< > $@ systemd-logger.service: units/systemd-logger.service.in Makefile - sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@ + sed -e 's,@libexecdir\@,$(libexecdir),g' \ + -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ + < $< > $@ CLEANFILES = \ systemd-interfaces.c \