NEWS: update NEWS file according to most recent changes in git

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index baf661d63f9f37fb94ff2288185a3e72a514b959..5b26bc3ceebbc66cb91f22a4848d938b0385da3f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=4
 
 LIBGUDEV_CURRENT=2
@@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_CURRENT=1
+LIBSYSTEMD_CURRENT=2
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=1
+LIBSYSTEMD_AGE=2
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -758,8 +758,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
-       src/shared/hwclock.c \
-       src/shared/hwclock.h \
+       src/shared/clock-util.c \
+       src/shared/clock-util.h \
        src/shared/time-dst.c \
        src/shared/time-dst.h \
        src/shared/calendarspec.c \
@@ -805,7 +805,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/ring.c \
        src/shared/ring.h \
        src/shared/async.c \
-       src/shared/async.h
+       src/shared/async.h \
+       src/shared/eventfd-util.c \
+       src/shared/eventfd-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -2509,6 +2511,7 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/network-internal.h
 
 libsystemd_network_la_LIBADD = \
+       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
@@ -2532,7 +2535,6 @@ test_dhcp_client_SOURCES = \
 
 test_dhcp_client_LDADD = \
        libsystemd-network.la \
-       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la
@@ -4066,7 +4068,6 @@ CLEANFILES += \
 systemd_timesyncd_LDADD = \
        libsystemd-resolve.la \
        libsystemd-network.la \
-       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
@@ -4218,7 +4219,6 @@ CLEANFILES += \
 
 systemd_resolved_LDADD = \
        libsystemd-network.la \
-       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la
@@ -5324,60 +5324,6 @@ tests += \
        test-libsystemd-sym \
        test-libudev-sym
 
-if ENABLE_COMPAT_LIBS
-test-libsystemd-daemon-sym.c: \
-               src/compat-libs/libsystemd-daemon.sym \
-               src/systemd/sd-daemon.h
-       $(generate-sym-test)
-
-test-libsystemd-id128-sym.c: \
-               src/compat-libs/libsystemd-id128.sym \
-               src/systemd/sd-id128.h
-       $(generate-sym-test)
-
-test-libsystemd-journal-sym.c: \
-               src/compat-libs/libsystemd-journal.sym \
-               src/systemd/sd-journal.h
-       $(generate-sym-test)
-
-test-libsystemd-login-sym.c: \
-               src/compat-libs/libsystemd-login.sym \
-               src/systemd/sd-login.h
-       $(generate-sym-test)
-
-test_libsystemd_daemon_sym_SOURCES = \
-       test-libsystemd-daemon-sym.c
-test_libsystemd_daemon_sym_LDADD = \
-       libsystemd-daemon.la
-
-test_libsystemd_id128_sym_SOURCES = \
-       test-libsystemd-id128-sym.c
-test_libsystemd_id128_sym_LDADD = \
-       libsystemd-id128.la
-
-test_libsystemd_journal_sym_SOURCES = \
-       test-libsystemd-journal-sym.c
-test_libsystemd_journal_sym_LDADD = \
-       libsystemd-journal.la
-
-test_libsystemd_login_sym_SOURCES = \
-       test-libsystemd-login-sym.c
-test_libsystemd_login_sym_LDADD = \
-       libsystemd-login.la
-
-BUILT_SOURCES += \
-       $(test_libsystemd_journal_sym_SOURCES) \
-       $(test_libsystemd_login_sym_SOURCES) \
-       $(test_libsystemd_id128_sym_SOURCES) \
-       $(test_libsystemd_daemon_sym_SOURCES)
-
-tests += \
-       test-libsystemd-journal-sym \
-       test-libsystemd-login-sym \
-       test-libsystemd-id128-sym \
-       test-libsystemd-daemon-sym
-endif
-
 .PHONY: cppcheck
 cppcheck:
        cppcheck --enable=all -q $(top_srcdir)