chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: add multi-part message test
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 4fe766aa638609f4f16268e7fa3ce49859e03b9b..451e53ace343d69ccaf320224d21695eae93b23a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1176,8
+1176,12
@@
manual_tests += \
test-install \
test-watchdog \
test-log \
test-install \
test-watchdog \
test-log \
- test-ipcrm \
+ test-ipcrm
+
+if HAVE_KMOD
+manual_tests += \
test-rtnl-manual
test-rtnl-manual
+endif
tests += \
test-job-type \
tests += \
test-job-type \
@@
-1402,10
+1406,14
@@
test_ipcrm_LDADD = \
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
+test_rtnl_manual_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(KMOD_CFLAGS)
+
test_rtnl_manual_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la \
test_rtnl_manual_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la \
- -lkmod
+ $(KMOD_LIBS)
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
@@
-1961,6
+1969,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
# ------------------------------------------------------------------------------
@@
-2107,6
+2116,8
@@
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-id128/sd-id128.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
src/libsystemd/sd-id128/sd-id128.c \
@@
-2584,8
+2595,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) \
@@
-3877,12
+3887,10
@@
nodist_userunit_DATA += \
units/user/systemd-bus-driverd.service
USER_BUSNAMES_TARGET_WANTS += \
units/user/systemd-bus-driverd.service
USER_BUSNAMES_TARGET_WANTS += \
- org.freedesktop.DBus.busname \
- org.freedesktop.systemd1.busname
+ org.freedesktop.DBus.busname
USER_UNIT_ALIASES += \
USER_UNIT_ALIASES += \
- $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \
- $(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname
+ $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
@@
-5036,9
+5044,9
@@
DISTCHECK_CONFIGURE_FLAGS += \
endif
# check "broken" platforms limited toolchains for link breakage before we release
endif
# check "broken" platforms limited toolchains for link breakage before we release
-.PHONY:
check-broken
-
check-broken
:
- $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-
-no
-as-needed -Wl,--no-gc-sections' distcheck
+.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:
.PHONY: hwdb-update
hwdb-update:
@@
-5051,16
+5059,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
@@
-5070,9
+5080,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
@@
-5165,6
+5176,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