From e2c766d37e20231db48e55edb5e23973df590569 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Sat, 12 May 2018 18:14:53 +0200 Subject: build: fix build rules for srcdir It's very hard to use some 'non-recurive' Makefiles with rest of system running 'recursively'. So ATM drop inclusion of subdir makefile and add support for 2 new top-level targets: unit-test (builds test/unit dir) run-unit-test (build & run test/unit/unit-test run) --- Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3274f174f..b0bceb044 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved. +# Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -61,6 +61,9 @@ po: tools daemons man: tools all_man: tools scripts: liblvm libdm +test: lib +unit-test: lib +run-unit-test: unit-test lib.device-mapper: include.device-mapper libdm.device-mapper: include.device-mapper @@ -96,7 +99,7 @@ endif DISTCLEAN_TARGETS += cscope.out CLEAN_DIRS += autom4te.cache -check check_system check_cluster check_local check_lvmetad check_lvmpolld check_lvmlockd_test check_lvmlockd_dlm check_lvmlockd_sanlock: all +check check_system check_cluster check_local check_lvmetad check_lvmpolld check_lvmlockd_test check_lvmlockd_dlm check_lvmlockd_sanlock unit-test run-unit-test: all $(MAKE) -C test $(@) conf.generate man.generate: tools @@ -145,7 +148,7 @@ install_system_dirs: $(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_RUN_DIR) $(INSTALL_ROOT_DATA) /dev/null $(DESTDIR)$(DEFAULT_CACHE_DIR)/.cache -install_initscripts: +install_initscripts: $(MAKE) -C scripts install_initscripts install_systemd_generators: @@ -210,10 +213,6 @@ endif endif -include test/unit/Makefile - -include device-mapper/Makefile - ifneq ($(shell which ctags),) .PHONY: tags tags: -- cgit v1.2.1