diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:56:36 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:56:36 -0400 |
| commit | be6cdcb499515a8dc200440f9c0f95d16edbaa2d (patch) | |
| tree | 9b7626a8a5341707648aa97f173954d0e94ca8d4 /src/grp-network | |
| parent | 3e439de4e3773f26c7efc8d84a57cf2530883739 (diff) | |
| parent | ca23ffae30b2cd8e2ac7f54f77a6ff8c59e3876f (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# build-aux/Makefile.each.tail/50-sd.mk
# build-aux/Makefile.each.tail/70-man.mk
# src/grp-resolve/libbasic-dns/Makefile
# src/grp-system/libcore/Makefile
# tools/notsd-move
Diffstat (limited to 'src/grp-network')
| -rw-r--r-- | src/grp-network/libnetworkd-core/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-network/systemd-networkd-wait-online/Makefile | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile index 3821f06c0f..740206413e 100644 --- a/src/grp-network/libnetworkd-core/Makefile +++ b/src/grp-network/libnetworkd-core/Makefile @@ -27,7 +27,6 @@ noinst_LTLIBRARIES += \ libnetworkd-core.la libnetworkd_core_la_CFLAGS = \ - $(AM_CFLAGS) libnetworkd_core_la_SOURCES = \ src/libsystemd-network/network-internal.h \ diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile index 25134d4966..6b6b96258a 100644 --- a/src/grp-network/systemd-networkd-wait-online/Makefile +++ b/src/grp-network/systemd-networkd-wait-online/Makefile @@ -27,7 +27,6 @@ rootlibexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_CFLAGS = \ - $(AM_CFLAGS) systemd_networkd_wait_online_SOURCES = \ src/libsystemd-network/network-internal.h \ |