diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 17:23:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 17:23:29 -0400 |
| commit | 5abbec416484b36048b9011d0ba0eb7888715765 (patch) | |
| tree | 7e49cbc49818ccf9b0f4449185efedfff355ebc8 /src/libsystemd | |
| parent | bcf1acd2a33706c296339f5627eb4070fdda2ecd (diff) | |
| parent | 3c809f112da0458a7d80c903543b430e08279385 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/libbasic/Makefile
# src/libshared/Makefile
# src/libsystemd/libsystemd-internal/Makefile
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/compat-libs/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-journal-internal/Makefile | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 50de17357f..b5e6e44523 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -282,4 +282,5 @@ nodist_test_libsystemd_sym_SOURCES = \ test_libsystemd_sym_LDADD = \ libsystemd.la +$(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile index 9ac9d1b560..44c4755d36 100644 --- a/src/libsystemd/compat-libs/Makefile +++ b/src/libsystemd/compat-libs/Makefile @@ -143,4 +143,5 @@ EXTRA_DIST += \ src/compat-libs/libsystemd-id128.pc.in \ src/compat-libs/libsystemd-daemon.pc.in +$(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index c85835a94d..38115c9108 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -120,6 +120,7 @@ libsystemd_internal_la_LIBADD = \ noinst_LTLIBRARIES += \ libsystemd-internal.la +$(eval $(value automake2autothing)) std.out_files += libsystemd-internal.la CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile index 4e1f7327ae..09677d6e5e 100644 --- a/src/libsystemd/libsystemd-journal-internal/Makefile +++ b/src/libsystemd/libsystemd-journal-internal/Makefile @@ -94,4 +94,5 @@ endif noinst_LTLIBRARIES += \ libsystemd-journal-internal.la +$(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk |