diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:07:35 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:07:35 -0400 |
| commit | 93fd8d3a035f6acb134adff0d6b34e7fba5e72af (patch) | |
| tree | c90c8871f6fcf184651c266eff8075085987977e /src/grp-machine | |
| parent | 7b997776df38e196b4a779ee4e6be3acd0a363e2 (diff) | |
| parent | f0f1df7d0a18ba2db795a610f27c1922cdbf6ed6 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'src/grp-machine')
| -rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/src/Makefile | 9 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/test/Makefile | 35 |
3 files changed, 36 insertions, 9 deletions
diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index 76e6e9ddee..7c64e6af5f 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -24,5 +24,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk nested.subdirs += src +nested.subdirs += test include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/libmachine-core/src/Makefile b/src/grp-machine/libmachine-core/src/Makefile index 75c196f199..a1e10f3cb4 100644 --- a/src/grp-machine/libmachine-core/src/Makefile +++ b/src/grp-machine/libmachine-core/src/Makefile @@ -41,13 +41,4 @@ libmachine_core_la_LIBADD = \ noinst_LTLIBRARIES += \ libmachine-core.la -test_machine_tables_SOURCES = \ - src/machine/test-machine-tables.c - -test_machine_tables_LDADD = \ - libmachine-core.la - -tests += \ - test-machine-tables - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/libmachine-core/test/Makefile b/src/grp-machine/libmachine-core/test/Makefile new file mode 100644 index 0000000000..a75e11f3ac --- /dev/null +++ b/src/grp-machine/libmachine-core/test/Makefile @@ -0,0 +1,35 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +test_machine_tables_SOURCES = \ + src/machine/test-machine-tables.c + +test_machine_tables_LDADD = \ + libmachine-core.la + +tests += \ + test-machine-tables + +include $(topsrcdir)/build-aux/Makefile.tail.mk |