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-system | |
| 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-system')
| -rw-r--r-- | src/grp-system/grp-utils/systemd-analyze/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-system/libcore/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-system/systemd/Makefile | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/grp-system/grp-utils/systemd-analyze/Makefile b/src/grp-system/grp-utils/systemd-analyze/Makefile index 9d647e5a52..cb1b72e77d 100644 --- a/src/grp-system/grp-utils/systemd-analyze/Makefile +++ b/src/grp-system/grp-utils/systemd-analyze/Makefile @@ -30,7 +30,6 @@ systemd_analyze_SOURCES = \ src/analyze/analyze-verify.h systemd_analyze_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile index b31d00fcdb..a72b4dc7ee 100644 --- a/src/grp-system/libcore/Makefile +++ b/src/grp-system/libcore/Makefile @@ -147,7 +147,6 @@ nodist_libcore_la_SOURCES = \ src/core/load-fragment-gperf-nulstr.c libcore_la_CFLAGS = \ - $(AM_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ $(KMOD_CFLAGS) \ diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile index 2f9d9ac819..4c8f39e7c4 100644 --- a/src/grp-system/systemd/Makefile +++ b/src/grp-system/systemd/Makefile @@ -28,7 +28,6 @@ systemd_SOURCES = \ src/core/main.c systemd_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) |