diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:50:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:50:07 -0400 |
| commit | 590eca26c13f4d704b2fc614e7ef49b600e6b5e0 (patch) | |
| tree | 0ce57d70ead69a55809c631d605d4fd2b6c853ef /src/grp-machine/libmachine-core/Makefile | |
| parent | d10902f55ae7aed2eeffedcd29d8ced80ec903ba (diff) | |
| parent | f0c56a8635949d284e6fb61e04d07e9a8e2b429b (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.each.tail/20-systemd.mk
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/busctl/Makefile
# src/grp-boot/bootctl/Makefile
# src/grp-boot/systemd-boot/Makefile
# src/grp-coredump/coredumpctl/Makefile
# src/grp-coredump/systemd-coredump/Makefile
# src/grp-machine/libmachine-core/Makefile
# src/grp-machine/nss-mymachines/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libudev/src/Makefile
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/grp-machine/libmachine-core/Makefile')
| -rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index c2b4ea3b50..8c324808ca 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -47,10 +47,10 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables -$(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus + include $(topsrcdir)/build-aux/Makefile.tail.mk |