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/systemd-cryptsetup | |
| 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/systemd-cryptsetup')
| -rw-r--r-- | src/systemd-cryptsetup/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index 346eab772a..96a2bfe99a 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/Makefile @@ -38,7 +38,6 @@ systemd_cryptsetup_SOURCES = \ src/cryptsetup/cryptsetup.c systemd_cryptsetup_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ |