diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-14 18:33:57 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-14 18:33:57 -0400 |
| commit | 3c72c8d3ee67388336aca58c5afa3fb93a9c24c0 (patch) | |
| tree | d072df7fee0f5906fad88c08398b2fe887cbc064 /src/grp-machine/systemd-machined/Makefile | |
| parent | e51613a3291342c6006edda8783755fb8994fd75 (diff) | |
| parent | 6ba6ca19507add38549e07058c57489a8cd98cd1 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# src/grp-journal/systemd-journald/Makefile
# src/grp-login/systemd-logind/Makefile
# src/grp-machine/grp-import/systemd-export/Makefile
# src/grp-machine/grp-import/systemd-import/Makefile
# src/grp-machine/grp-import/systemd-pull/Makefile
# src/grp-machine/systemd-machined/Makefile
# src/grp-network/libnetworkd-core/Makefile
# src/grp-resolve/libbasic-dns/Makefile
# src/grp-resolve/systemd-resolved/Makefile
# src/grp-utils/systemd-path/Makefile
# src/libshared/src/Makefile
# src/libsystemd-network/include/systemd-network/sd-ndisc.h
# src/libsystemd/Makefile
# src/libsystemd/src/test.mk
# src/libudev/Makefile
# src/systemd-dbus1-generator/Makefile
# src/systemd-nspawn/nspawn.c
Signed-off-by: Luke Shumaker <lukeshu@sbcglobal.net>
Diffstat (limited to 'src/grp-machine/systemd-machined/Makefile')
| -rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 66ac0b9275..97fa68c5f9 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/Makefile @@ -24,19 +24,19 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk systemd_machined_SOURCES = \ - $(_libmachine_core_la_SOURCES) \ src/machine/machined.c \ src/machine/machined.h systemd_machined_LDADD = \ libsystemd-internal.la \ libshared.la \ - libbasic.la + libbasic.la \ + libmachine-core.la rootlibexec_PROGRAMS += \ systemd-machined -_libmachine_core_la_SOURCES = \ +libmachine_core_la_SOURCES = \ src/machine/machine.c \ src/machine/machine.h \ src/machine/machined-dbus.c \ @@ -47,10 +47,18 @@ _libmachine_core_la_SOURCES = \ src/machine/operation.c \ src/machine/operation.h +libmachine_core_la_LIBADD = \ + libsystemd-shared.la + +noinst_LTLIBRARIES += \ + libmachine-core.la + test_machine_tables_SOURCES = \ - $(_libmachine_core_la_SOURCES) \ src/machine/test-machine-tables.c +test_machine_tables_LDADD = \ + libmachine-core.la + tests += \ test-machine-tables |