chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: prepare 201
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 2a2a9fe2ed3211b486485398b53a694ecabcba5c..21a0e4b09a429b184451cca9d5d85069d708694c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,28
+32,28
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=4
.SECONDARY:
LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
4
-LIBSYSTEMD_LOGIN_REVISION=
2
-LIBSYSTEMD_LOGIN_AGE=
4
+LIBSYSTEMD_LOGIN_CURRENT=
5
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
5
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
8
+LIBSYSTEMD_DAEMON_REVISION=
9
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
19
+LIBSYSTEMD_ID128_REVISION=
20
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
8
-LIBSYSTEMD_JOURNAL_REVISION=
2
-LIBSYSTEMD_JOURNAL_AGE=
8
+LIBSYSTEMD_JOURNAL_CURRENT=
9
+LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_AGE=
9
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-222,7
+222,7
@@
define add-wants
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
- for i in $$what; do
ln -s
../$$i . || exit $$? ; done )
+ for i in $$what; do
$(LN_S)
../$$i . || exit $$? ; done )
endef
install-directories-hook:
endef
install-directories-hook:
@@
-240,7
+240,7
@@
define install-aliases
$(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
rm -f $(DESTDIR)$$dir/$$2 && \
$(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
rm -f $(DESTDIR)$$dir/$$2 && \
-
ln -s
$$1 $(DESTDIR)$$dir/$$2 && \
+
$(LN_S)
$$1 $(DESTDIR)$$dir/$$2 && \
shift 2 || exit $$?; \
done
endef
shift 2 || exit $$?; \
done
endef
@@
-1087,7
+1087,9
@@
noinst_tests += \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
- test-prioq
+ test-prioq \
+ test-fileio \
+ test-time
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1187,6
+1189,24
@@
test_prioq_CFLAGS = \
test_prioq_LDADD = \
libsystemd-core.la
test_prioq_LDADD = \
libsystemd-core.la
+test_fileio_SOURCES = \
+ src/test/test-fileio.c
+
+test_fileio_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_fileio_LDADD = \
+ libsystemd-core.la
+
+test_time_SOURCES = \
+ src/test/test-time.c
+
+test_time_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_time_LDADD = \
+ libsystemd-core.la
+
test_log_SOURCES = \
src/test/test-log.c
test_log_SOURCES = \
src/test/test-log.c
@@
-1612,7
+1632,9
@@
systemd_stdio_bridge_SOURCES = \
src/stdio-bridge/stdio-bridge.c
systemd_stdio_bridge_LDADD = \
src/stdio-bridge/stdio-bridge.c
systemd_stdio_bridge_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-daemon.la
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
@@
-2467,7
+2489,8
@@
libsystemd_id128_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
@@
-3529,7
+3552,6
@@
pam_systemd_la_LDFLAGS = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
- libsystemd-daemon.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \