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-machine/grp-import | |
| 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-machine/grp-import')
5 files changed, 0 insertions, 5 deletions
diff --git a/src/grp-machine/grp-import/libimport/Makefile b/src/grp-machine/grp-import/libimport/Makefile index ee10c0f6df..5b15c57715 100644 --- a/src/grp-machine/grp-import/libimport/Makefile +++ b/src/grp-machine/grp-import/libimport/Makefile @@ -41,7 +41,6 @@ test_qcow2_SOURCES = \ src/import/qcow2-util.h test_qcow2_CFLAGS = \ - $(AM_CFLAGS) \ $(ZLIB_CFLAGS) test_qcow2_LDADD = \ diff --git a/src/grp-machine/grp-import/systemd-export/Makefile b/src/grp-machine/grp-import/systemd-export/Makefile index aa8792565a..f641d93f14 100644 --- a/src/grp-machine/grp-import/systemd-export/Makefile +++ b/src/grp-machine/grp-import/systemd-export/Makefile @@ -33,7 +33,6 @@ systemd_export_SOURCES = \ src/import/export-raw.h systemd_export_CFLAGS = \ - $(AM_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ $(BZIP2_CFLAGS) diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile index 221659c346..fe3105914c 100644 --- a/src/grp-machine/grp-import/systemd-import/Makefile +++ b/src/grp-machine/grp-import/systemd-import/Makefile @@ -32,7 +32,6 @@ systemd_import_SOURCES = \ src/import/import-tar.h systemd_import_CFLAGS = \ - $(AM_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ $(BZIP2_CFLAGS) diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile index e00f531a0d..19705a925e 100644 --- a/src/grp-machine/grp-import/systemd-importd/Makefile +++ b/src/grp-machine/grp-import/systemd-importd/Makefile @@ -28,7 +28,6 @@ systemd_importd_SOURCES = \ src/import/importd.c systemd_importd_CFLAGS = \ - $(AM_CFLAGS) \ -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" diff --git a/src/grp-machine/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile index 780a5a4610..0b593158e4 100644 --- a/src/grp-machine/grp-import/systemd-pull/Makefile +++ b/src/grp-machine/grp-import/systemd-pull/Makefile @@ -38,7 +38,6 @@ systemd_pull_SOURCES = \ src/import/curl-util.h systemd_pull_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ |