chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd-logind: Fix linking by reordering libraries in LDADD
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index eee73e59509966aeb69b30f99cd2df102ed9b982..a9f72c1e15d5e3dc7b332f822b4811313ce1efbf 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-124,9
+124,15
@@
dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-noinst_tests=
-noinst_PROGRAMS = $(noinst_tests)
-TESTS = $(noinst_tests)
+tests=
+manual_tests =
+if ENABLE_TESTS
+noinst_PROGRAMS = $(manual_tests) $(tests)
+TESTS = $(tests)
+else
+noinst_PROGRAMS =
+TESTS =
+endif
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
@@
-560,7
+566,7
@@
noinst_DATA += \
CLEANFILES += \
man/index.html
CLEANFILES += \
man/index.html
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml
$(top_builddir)/man/*.xml
)
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
@@
-680,7
+686,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/calendarspec.h \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/calendarspec.h \
src/shared/fileio.c \
src/shared/fileio.h \
- src/shared/output-mode.h
+ src/shared/output-mode.h \
+ src/shared/MurmurHash3.c \
+ src/shared/MurmurHash3.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-1061,7
+1069,7
@@
CLEANFILES += \
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-engine \
test-ns \
test-loopback \
test-engine \
test-ns \
test-loopback \
@@
-1072,7
+1080,7
@@
noinst_PROGRAMS += \
test-watchdog \
test-log
test-watchdog \
test-log
-
noinst_
tests += \
+tests += \
test-job-type \
test-env-replace \
test-strbuf \
test-job-type \
test-env-replace \
test-strbuf \
@@
-1143,7
+1151,7
@@
test_hostname_LDADD = \
libsystemd-core.la
if ENABLE_EFI
libsystemd-core.la
if ENABLE_EFI
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-efivars
test_efivars_SOURCES = \
test-efivars
test_efivars_SOURCES = \
@@
-1711,7
+1719,10
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-type.c \
src/libsystemd-bus/bus-type.h \
src/libsystemd-bus/bus-match.c \
src/libsystemd-bus/bus-type.c \
src/libsystemd-bus/bus-type.h \
src/libsystemd-bus/bus-match.c \
- src/libsystemd-bus/bus-match.h
+ src/libsystemd-bus/bus-match.h \
+ src/libsystemd-bus/bus-bloom.c \
+ src/libsystemd-bus/bus-bloom.h \
+ src/libsystemd-bus/kdbus.h
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
@@
-1721,7
+1732,7
@@
libsystemd_bus_la_LIBADD = \
noinst_LTLIBRARIES += \
libsystemd-bus.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
-
noinst_
tests += \
+tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
@@
-2069,7
+2080,7
@@
TESTS += \
test/udev-test.pl \
test/rules-test.sh
test/udev-test.pl \
test/rules-test.sh
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-libudev \
test-udev
test-libudev \
test-udev
@@
-2522,7
+2533,7
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128-internal.la
libsystemd-shared.la \
libsystemd-id128-internal.la
-
noinst_
tests += \
+tests += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2830,10
+2841,10
@@
catalog-remove-hook:
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-journal-enum
test-journal-enum
-
noinst_
tests += \
+tests += \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal \
test-journal-send \
test-journal-syslog \
@@
-3076,7
+3087,8
@@
systemd_bootchart_SOURCES = \
src/bootchart/svg.h
systemd_bootchart_LDADD = \
src/bootchart/svg.h
systemd_bootchart_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-journal.la
rootlibexec_PROGRAMS += \
systemd-bootchart
rootlibexec_PROGRAMS += \
systemd-bootchart
@@
-3455,8
+3467,8
@@
systemd_logind_CFLAGS = \
systemd_logind_LDADD = \
libsystemd-label.la \
systemd_logind_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-audit.la \
+ libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
libudev.la
libsystemd-daemon.la \
libsystemd-dbus.la \
libudev.la
@@
-3530,7
+3542,7
@@
test_inhibit_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-login \
test-inhibit
test-login \
test-inhibit