chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: fix a few issues detected by the llvm static analyzer
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 062ca0af2307dc7b62270681b43eb5b8718a621d..34e3982de4e522db86f2a5234d26a7da69771bcc 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-83,7
+83,6
@@
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
-DISTCHECK_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
@@
-98,6
+97,8
@@
dist_pkgsysconf_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
+check_PROGRAMS =
+TESTS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@
-210,7
+211,7
@@
bin_PROGRAMS = \
systemd-detect-virt
dist_bin_SCRIPTS = \
systemd-detect-virt
dist_bin_SCRIPTS = \
- src/systemd-analyze
+ src/
analyze/
systemd-analyze
rootlibexec_PROGRAMS = \
systemd \
rootlibexec_PROGRAMS = \
systemd \
@@
-230,19
+231,6
@@
rootlibexec_PROGRAMS = \
systemgenerator_PROGRAMS = \
systemd-getty-generator
systemgenerator_PROGRAMS = \
systemd-getty-generator
-noinst_PROGRAMS = \
- test-engine \
- test-job-type \
- test-ns \
- test-loopback \
- test-hostname \
- test-daemon \
- test-cgroup \
- test-env-replace \
- test-strv \
- test-install \
- test-watchdog
-
dist_bashcompletion_DATA = \
bash-completion/systemd-bash-completion.sh
dist_bashcompletion_DATA = \
bash-completion/systemd-bash-completion.sh
@@
-868,6
+856,24
@@
EXTRA_DIST += \
src/core/systemd.pc.in
# ------------------------------------------------------------------------------
src/core/systemd.pc.in
# ------------------------------------------------------------------------------
+check_PROGRAMS += \
+ test-engine \
+ test-job-type \
+ test-ns \
+ test-loopback \
+ test-hostname \
+ test-daemon \
+ test-cgroup \
+ test-env-replace \
+ test-strv \
+ test-install \
+ test-watchdog
+
+TESTS += \
+ test-job-type \
+ test-env-replace \
+ test-strv
+
test_engine_SOURCES = \
src/test/test-engine.c
test_engine_SOURCES = \
src/test/test-engine.c
@@
-1427,7
+1433,8
@@
libudev_core_la_SOURCES = \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-kmod.c \
src/udev/udev-builtin-path_id.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-kmod.c \
src/udev/udev-builtin-path_id.c \
- src/udev/udev-builtin-usb_id.c
+ src/udev/udev-builtin-usb_id.c \
+ src/libsystemd-daemon/sd-daemon.c
libudev_core_la_CFLAGS = \
$(AM_CFLAGS) \
libudev_core_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-1436,7
+1443,6
@@
libudev_core_la_CFLAGS = \
libudev_core_la_LIBADD = \
libudev-private.la \
libudev_core_la_LIBADD = \
libudev-private.la \
- libsystemd-daemon.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@
-1449,10
+1455,10
@@
libudev_core_la_CPPFLAGS = \
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
- src/login/logind-acl.c
+ src/login/logind-acl.c \
+ src/login/sd-login.c
libudev_core_la_LIBADD += \
libudev_core_la_LIBADD += \
- libsystemd-login.la \
libsystemd-acl.la
endif
libsystemd-acl.la
endif
@@
-1477,11
+1483,11
@@
udevadm_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-shared.la
# ------------------------------------------------------------------------------
-TESTS = \
+TESTS
+
= \
src/udev/test/udev-test.pl \
src/udev/test/rules-test.sh
src/udev/test/udev-test.pl \
src/udev/test/rules-test.sh
-check_PROGRAMS = \
+check_PROGRAMS
+
= \
test-libudev \
test-udev
test-libudev \
test-udev
@@
-1512,7
+1518,8
@@
DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
EXTRA_DIST += \
src/udev/test/sys.tar.xz \
EXTRA_DIST += \
src/udev/test/sys.tar.xz \
- $(TESTS) \
+ src/udev/test/udev-test.pl \
+ src/udev/test/rules-test.sh \
src/udev/test/rule-syntax-check.py
# ------------------------------------------------------------------------------
src/udev/test/rule-syntax-check.py
# ------------------------------------------------------------------------------
@@
-1697,7
+1704,7
@@
src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud
$(AM_V_GEN)glib-mkenums --template $^ > \
$@.tmp && mv $@.tmp $@
$(AM_V_GEN)glib-mkenums --template $^ > \
$@.tmp && mv $@.tmp $@
-if
ENABL
E_INTROSPECTION
+if
HAV
E_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
-include $(INTROSPECTION_MAKEFILE)
src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
@@
-1741,7
+1748,7
@@
typelibs_DATA = \
src/udev/gudev/GUdev-1.0.typelib
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
src/udev/gudev/GUdev-1.0.typelib
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif #
ENABL
E_INTROSPECTION
+endif #
HAV
E_INTROSPECTION
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libgudev-install-move-hook:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libgudev-install-move-hook:
@@
-1789,6
+1796,9
@@
dist_udevhome_SCRIPTS = \
src/udev/keymap/findkeyboards \
src/udev/keymap/keyboard-force-release.sh
src/udev/keymap/findkeyboards \
src/udev/keymap/keyboard-force-release.sh
+TESTS += \
+ src/udev/keymap/check-keymaps.sh
+
EXTRA_DIST += \
src/udev/keymap/check-keymaps.sh
EXTRA_DIST += \
src/udev/keymap/check-keymaps.sh
@@
-1878,10
+1888,6
@@
src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-keymaps-distcheck-hook: src/udev/keymap/keys.txt
- $(top_srcdir)/src/udev/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS += keymaps-distcheck-hook
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-1923,7
+1929,10
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128.la
libsystemd-shared.la \
libsystemd-id128.la
-noinst_PROGRAMS += \
+check_PROGRAMS += \
+ test-id128
+
+TESTS += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2102,7
+2111,7
@@
libsystemd-journal-uninstall-hook:
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
-
noinst
_PROGRAMS += \
+
check
_PROGRAMS += \
test-journal \
test-journal-send
test-journal \
test-journal-send
@@
-2625,7
+2634,7
@@
test_login_LDADD = \
libsystemd-login.la \
libsystemd-shared.la
libsystemd-login.la \
libsystemd-shared.la
-
noinst
_PROGRAMS += \
+
check
_PROGRAMS += \
test-login
libsystemd_login_la_SOURCES = \
test-login
libsystemd_login_la_SOURCES = \
@@
-3171,8
+3180,6
@@
uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
-distcheck-hook: $(DISTCHECK_HOOKS)
-
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
DISTCHECK_CONFIGURE_FLAGS = \
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
DISTCHECK_CONFIGURE_FLAGS = \