X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=5d846052d80088bee77a0d97900aab4e4ab4fd43;hp=65a7ffeb2720ea440f6ce6c16843597701b894e5;hb=50d6810ea8117bbfcf7007ae779d1a98a7300b5f;hpb=5892a914d173e4b968d2a14fbf717373dee3999a diff --git a/Makefile.am b/Makefile.am index 65a7ffeb2..5d846052d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=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@ @@ -779,8 +779,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/ima-util.h \ src/shared/ptyfwd.c \ src/shared/ptyfwd.h \ - src/shared/net-util.c \ - src/shared/net-util.h \ src/shared/errno-list.c \ src/shared/errno-list.h \ src/shared/af-list.c \ @@ -1021,8 +1019,6 @@ libsystemd_core_la_SOURCES = \ src/core/condition.h \ src/core/namespace.c \ src/core/namespace.h \ - src/core/tcpwrap.c \ - src/core/tcpwrap.h \ src/core/build.h \ src/core/sysfs-show.h \ src/core/switch-root.h \ @@ -1048,7 +1044,6 @@ nodist_libsystemd_core_la_SOURCES = \ libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ - $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ $(CAP_CFLAGS) \ @@ -1064,7 +1059,6 @@ libsystemd_core_la_LIBADD = \ libudev-internal.la \ libsystemd-shared.la \ libsystemd-internal.la \ - $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ $(CAP_LIBS) \ @@ -1178,10 +1172,12 @@ manual_tests += \ test-hostname \ test-daemon \ test-cgroup \ + test-cgroup-mask \ test-install \ test-watchdog \ test-log \ - test-ipcrm + test-ipcrm \ + test-rtnl-manual tests += \ test-job-type \ @@ -1204,7 +1200,6 @@ tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ - test-cgroup-mask \ test-prioq \ test-fileio \ test-time \ @@ -1404,6 +1399,14 @@ test_ipcrm_LDADD = \ 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 @@ -1958,6 +1961,7 @@ systemd_cgls_SOURCES = \ src/cgls/cgls.c systemd_cgls_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2104,10 +2108,10 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-rtnl/sd-rtnl.c \ src/libsystemd/sd-rtnl/rtnl-internal.h \ src/libsystemd/sd-rtnl/rtnl-message.c \ + src/libsystemd/sd-rtnl/rtnl-types.h \ + src/libsystemd/sd-rtnl/rtnl-types.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 @@ -2123,8 +2127,17 @@ libsystemd_internal_la_CFLAGS = \ 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 += \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-resolve.la libsystemd_dump_la_SOURCES = \ src/libsystemd/sd-bus/bus-dump.c \ @@ -2153,6 +2166,7 @@ BUILT_SOURCES += \ libsystemd_la_SOURCES = \ $(libsystemd_internal_la_SOURCES) \ + $(libsystemd_resolve_la_SOURCES) \ $(libsystemd_journal_internal_la_SOURCES) nodist_libsystemd_la_SOURCES = \ @@ -2417,6 +2431,7 @@ test_resolve_SOURCES = \ test_resolve_LDADD = \ libsystemd-internal.la \ + libsystemd-resolve.la \ libsystemd-shared.la \ -lresolv @@ -2460,7 +2475,9 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/sd-ipv4ll.c \ src/libsystemd-network/ipv4ll-network.c \ src/libsystemd-network/ipv4ll-packet.c \ - src/libsystemd-network/ipv4ll-internal.h + src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/network-internal.c \ + src/libsystemd-network/network-internal.h libsystemd_network_la_LIBADD = \ libsystemd-label.la \ @@ -2720,6 +2737,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ + libsystemd-network.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -3513,8 +3531,8 @@ systemd_coredump_SOURCES = \ systemd_coredump_LDADD = \ libsystemd-journal-internal.la \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-coredump @@ -3851,11 +3869,11 @@ nodist_systemunit_DATA += \ units/systemd-bus-driverd.service dist_systemunit_DATA += \ - units/org.freedesktop.DBus.busname \ + units/org.freedesktop.DBus.busname \ units/org.freedesktop.systemd1.busname BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname \ + org.freedesktop.DBus.busname \ org.freedesktop.systemd1.busname nodist_userunit_DATA += \ @@ -5018,6 +5036,11 @@ DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +# check "broken" platforms limited toolchains for link breakage before we release +.PHONY: linkcheck +linkcheck: + $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-fuse-ld=gold -Wl,--as-needed -Wl,--no-gc-sections' distcheck + .PHONY: hwdb-update hwdb-update: ( cd $(top_srcdir)/hwdb && \ @@ -5029,16 +5052,18 @@ hwdb-update: .PHONY: kdbus-update kdbus-update: - ( cd $(top_srcdir)/src/libsystemd/ && \ + ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \ wget -N https://d-bus.googlecode.com/git/kdbus.h ) +.PHONY: git-tag +git-tag: + git tag -s "v$(VERSION)" -m "systemd $(VERSION)" + +www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd .PHONY: upload upload: all check dist - cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ - scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ - scp man/*.html tango:public/systemd-man/ + scp systemd-$(VERSION).tar.xz $(www_target) -www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd .PHONY: doc-sync doc-sync: all destdir-sphinx gtkdoc-rebase --html-dir=docs/libudev/html --online @@ -5048,9 +5073,10 @@ doc-sync: all destdir-sphinx rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/ -.PHONY: git-tag -git-tag: - git tag -s "v$(VERSION)" -m "systemd $(VERSION)" +.PHONY: tango +tango: upload + cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ + scp man/*.html tango:public/systemd-man/ .PHONY: install-tree install-tree: all