X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=42fed59641e26550d3b88c22d7982c2c3382169a;hb=bb11271068ff34434f5b8cefd0c2c0bae5ed7fd1;hp=53a3bb9f900897e6b02fbe8272bf8e94cbd47bab;hpb=6e6fb527f987d0c1f5bd930020301c9ac76a5e2c;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 53a3bb9f9..42fed5964 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1185,7 +1185,8 @@ noinst_PROGRAMS += \
 	test-unit-file \
 	test-date \
 	test-sleep \
-	test-replace-var
+	test-replace-var \
+	test-sched-prio
 
 TESTS += \
 	test-job-type \
@@ -1195,7 +1196,15 @@ TESTS += \
 	test-unit-file \
 	test-date \
 	test-sleep \
-	test-replace-var
+	test-replace-var \
+	test-sched-prio
+
+EXTRA_DIST += \
+	test/sched_idle_bad.service \
+	test/sched_idle_ok.service \
+	test/sched_rr_bad.service \
+	test/sched_rr_ok.service \
+	test/sched_rr_change.service
 
 test_engine_SOURCES = \
 	src/test/test-engine.c
@@ -1248,6 +1257,10 @@ test_unit_name_LDADD = \
 test_unit_file_SOURCES = \
 	src/test/test-unit-file.c
 
+test_unit_file_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
 test_unit_file_LDADD = \
 	libsystemd-core.la
 
@@ -1319,6 +1332,18 @@ test_watchdog_SOURCES = \
 test_watchdog_LDADD = \
 	libsystemd-shared.la
 
+test_sched_prio_SOURCES = \
+	src/test/test-sched-prio.c
+
+test_sched_prio_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+
+test_sched_prio_LDADD = \
+	libsystemd-core.la \
+	libsystemd-daemon.la
+
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
 	src/initctl/initctl.c
@@ -2432,42 +2457,12 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
 	src/journal/journald.c \
-	src/journal/journald.h \
-	src/journal/journald-kmsg.c \
-	src/journal/journald-kmsg.h \
-	src/journal/journald-syslog.c \
-	src/journal/journald-syslog.h \
-	src/journal/journald-stream.c \
-	src/journal/journald-stream.h \
-	src/journal/journald-console.c \
-	src/journal/journald-console.h \
-	src/journal/journald-native.c \
-	src/journal/journald-native.h \
-	src/journal/journald-rate-limit.c \
-	src/journal/journald-rate-limit.h \
-	src/journal/journal-internal.h
-
-nodist_systemd_journald_SOURCES = \
-	src/journal/journald-gperf.c
+	src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-audit.la \
-	libsystemd-daemon.la \
-	libsystemd-id128-internal.la \
 	libsystemd-journal-internal.la \
-	libudev.la
-
-if ENABLE_LOGIND
-systemd_journald_LDADD += \
-	libsystemd-login-internal.la
-endif
-
-if HAVE_ACL
-systemd_journald_LDADD += \
-	libsystemd-acl.la
-endif
+	libsystemd-shared.la \
+	libsystemd-id128-internal.la
 
 systemd_cat_SOURCES = \
 	src/journal/cat.c
@@ -2524,12 +2519,11 @@ test_journal_send_LDADD = \
 	libsystemd-id128-internal.la
 
 test_journal_syslog_SOURCES = \
-	src/journal/test-journal-syslog.c \
-	src/journal/journald-syslog.c
+	src/journal/test-journal-syslog.c
 
 test_journal_syslog_LDADD = \
-	libsystemd-shared.la \
 	libsystemd-journal-internal.la \
+	libsystemd-shared.la \
 	libsystemd-id128-internal.la
 
 test_journal_match_SOURCES = \
@@ -2603,12 +2597,44 @@ libsystemd_journal_la_LIBADD = \
 	libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
-	$(libsystemd_journal_la_SOURCES)
+	$(libsystemd_journal_la_SOURCES) \
+	src/journal/journald-kmsg.c \
+	src/journal/journald-kmsg.h \
+	src/journal/journald-syslog.c \
+	src/journal/journald-syslog.h \
+	src/journal/journald-stream.c \
+	src/journal/journald-stream.h \
+	src/journal/journald-server.c \
+	src/journal/journald-server.h \
+	src/journal/journald-console.c \
+	src/journal/journald-console.h \
+	src/journal/journald-native.c \
+	src/journal/journald-native.h \
+	src/journal/journald-rate-limit.c \
+	src/journal/journald-rate-limit.h \
+	src/journal/journal-internal.h
 
 libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD =
+libsystemd_journal_internal_la_LIBADD = \
+	libsystemd-label.la \
+	libsystemd-audit.la \
+	libsystemd-daemon.la \
+	libudev.la
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
+	src/journal/journald-gperf.c
+
+if ENABLE_LOGIND
+libsystemd_journal_internal_la_LIBADD += \
+	libsystemd-login-internal.la
+endif
+
+if HAVE_ACL
+libsystemd_journal_internal_la_LIBADD += \
+	libsystemd-acl.la
+endif
 
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \