chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: ignore kernel errors reported via close(), unless it is EBADF
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f0cfe46e766820c2398c8dc14959e810b6dc7d4f..0ad1729c0b2f0eed7d06c0e3e4bc2a6d814de3b3 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@
@@
-779,8
+779,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
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 \
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/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 \
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) \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(LIBWRAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
@@
-1064,7
+1059,6
@@
libsystemd_core_la_LIBADD = \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
- $(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
@@
-1178,10
+1172,12
@@
manual_tests += \
test-hostname \
test-daemon \
test-cgroup \
test-hostname \
test-daemon \
test-cgroup \
+ test-cgroup-mask \
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 \
@@
-1204,7
+1200,6
@@
tests += \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
- test-cgroup-mask \
test-prioq \
test-fileio \
test-time \
test-prioq \
test-fileio \
test-time \
@@
-1404,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
@@
-1958,6
+1961,7
@@
systemd_cgls_SOURCES = \
src/cgls/cgls.c
systemd_cgls_LDADD = \
src/cgls/cgls.c
systemd_cgls_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.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/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-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
@@
-2123,8
+2127,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 \
@@
-2153,6
+2166,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 = \
@@
-2417,6
+2431,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
@@
-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/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 \
libsystemd_network_la_LIBADD = \
libsystemd-label.la \
@@
-2570,8
+2587,7
@@
noinst_LTLIBRARIES += \
libudev_internal_la_SOURCES =\
$(libudev_la_SOURCES) \
libudev_internal_la_SOURCES =\
$(libudev_la_SOURCES) \
- src/libudev/libudev-device-private.c \
- src/libudev/libudev-queue-private.c
+ src/libudev/libudev-device-private.c
libudev_internal_la_CFLAGS = \
$(AM_CFLAGS) \
libudev_internal_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-2720,6
+2736,7
@@
libudev_core_la_LIBADD = \
libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
+ libsystemd-network.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@
-3513,8
+3530,8
@@
systemd_coredump_SOURCES = \
systemd_coredump_LDADD = \
libsystemd-journal-internal.la \
libsystemd-label.la \
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
rootlibexec_PROGRAMS += \
systemd-coredump
@@
-3851,10
+3868,12
@@
nodist_systemunit_DATA += \
units/systemd-bus-driverd.service
dist_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 += \
BUSNAMES_TARGET_WANTS += \
- org.freedesktop.DBus.busname
+ org.freedesktop.DBus.busname \
+ org.freedesktop.systemd1.busname
nodist_userunit_DATA += \
units/user/systemd-bus-driverd.service
nodist_userunit_DATA += \
units/user/systemd-bus-driverd.service
@@
-5016,6
+5035,11
@@
DISTCHECK_CONFIGURE_FLAGS += \
--enable-gtk-doc
endif
--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 && \
.PHONY: hwdb-update
hwdb-update:
( cd $(top_srcdir)/hwdb && \
@@
-5027,16
+5051,18
@@
hwdb-update:
.PHONY: kdbus-update
kdbus-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 )
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
.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
.PHONY: doc-sync
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/libudev/html --online
@@
-5046,9
+5072,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/
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
.PHONY: install-tree
install-tree: all
@@
-5141,6
+5168,9
@@
test_libsystemd_sym_LDADD = \
test_libudev_sym_SOURCES = \
test-libudev-sym.c
test_libudev_sym_SOURCES = \
test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+ $(AM_CFLAGS) \
+ -Wno-deprecated-declarations
test_libudev_sym_LDADD = \
libudev.la
test_libudev_sym_LDADD = \
libudev.la