chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gitignore update
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 2cb0f2aea2d970bdc6e042e02b795e88f7f19839..74fbadf28716223a5affed38b279f1fbb8e676d4 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-59,9
+59,9
@@
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_CURRENT=
0
-LIBSYSTEMD_REVISION=
2
-LIBSYSTEMD_AGE=
0
+LIBSYSTEMD_CURRENT=
1
+LIBSYSTEMD_REVISION=
0
+LIBSYSTEMD_AGE=
1
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-1175,7
+1175,8
@@
manual_tests += \
test-install \
test-watchdog \
test-log \
test-install \
test-watchdog \
test-log \
- test-ipcrm
+ test-ipcrm \
+ test-rtnl-manual
tests += \
test-job-type \
tests += \
test-job-type \
@@
-1398,6
+1399,14
@@
test_ipcrm_LDADD = \
libsystemd-shared.la \
-lrt
libsystemd-shared.la \
-lrt
+test_rtnl_manual_SOURCES = \
+ src/test/test-rtnl-manual.c
+
+test_rtnl_manual_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ -lkmod
+
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
@@
-2100,8
+2109,6
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-rtnl/rtnl-message.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
src/libsystemd/sd-rtnl/rtnl-message.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
- src/libsystemd/sd-resolve/sd-resolve.c \
- src/libsystemd/sd-resolve/resolve-util.h \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c
@@
-2117,8
+2124,17
@@
libsystemd_internal_la_CFLAGS = \
libsystemd_internal_la_LIBADD = \
$(RT_LIBS)
libsystemd_internal_la_LIBADD = \
$(RT_LIBS)
+libsystemd_resolve_la_SOURCES = \
+ src/libsystemd/sd-resolve/sd-resolve.c \
+ src/libsystemd/sd-resolve/resolve-util.h
+
+libsystemd_resolve_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
noinst_LTLIBRARIES += \
noinst_LTLIBRARIES += \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-resolve.la
libsystemd_dump_la_SOURCES = \
src/libsystemd/sd-bus/bus-dump.c \
libsystemd_dump_la_SOURCES = \
src/libsystemd/sd-bus/bus-dump.c \
@@
-2147,6
+2163,7
@@
BUILT_SOURCES += \
libsystemd_la_SOURCES = \
$(libsystemd_internal_la_SOURCES) \
libsystemd_la_SOURCES = \
$(libsystemd_internal_la_SOURCES) \
+ $(libsystemd_resolve_la_SOURCES) \
$(libsystemd_journal_internal_la_SOURCES)
nodist_libsystemd_la_SOURCES = \
$(libsystemd_journal_internal_la_SOURCES)
nodist_libsystemd_la_SOURCES = \
@@
-2411,6
+2428,7
@@
test_resolve_SOURCES = \
test_resolve_LDADD = \
libsystemd-internal.la \
test_resolve_LDADD = \
libsystemd-internal.la \
+ libsystemd-resolve.la \
libsystemd-shared.la \
-lresolv
libsystemd-shared.la \
-lresolv