diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-02 13:16:20 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-02 13:16:20 -0400 |
commit | 41463469a994bd378c052ab059eb9c4e84670951 (patch) | |
tree | b8550ffc0704ccd70fda5bd026ebbfa0b608c528 /src | |
parent | 3f9916a355913242460edf1a93f80598c5bf9d37 (diff) | |
parent | fb012c2788d61a333296e1f2b0f44d304517aa2d (diff) |
Merge branch 'lukeshu/postmove' into lukeshu/master
Diffstat (limited to 'src')
-rw-r--r-- | src/import/Makefile | 13 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/Makefile | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/import/Makefile b/src/import/Makefile index 52b1d7cd10..0f9abf0dd6 100644 --- a/src/import/Makefile +++ b/src/import/Makefile @@ -75,6 +75,7 @@ systemd_pull_CFLAGS = \ $(LIBCURL_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) \ $(GCRYPT_CFLAGS) \ -D VENDOR_KEYRING_PATH=\"$(libexecdir)/import-pubring.gpg\" \ -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" @@ -84,7 +85,7 @@ systemd_pull_LDADD = \ $(LIBCURL_LIBS) \ $(XZ_LIBS) \ $(ZLIB_LIBS) \ - -lbz2 \ + $(BZIP2_LIBS) \ $(GCRYPT_LIBS) systemd_import_SOURCES = \ @@ -103,13 +104,14 @@ systemd_import_SOURCES = \ systemd_import_CFLAGS = \ $(AM_CFLAGS) \ $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) systemd_import_LDADD = \ libshared.la \ $(XZ_LIBS) \ $(ZLIB_LIBS) \ - -lbz2 + $(BZIP2_LIBS) systemd_export_SOURCES = \ src/import/export.c \ @@ -125,13 +127,14 @@ systemd_export_SOURCES = \ systemd_export_CFLAGS = \ $(AM_CFLAGS) \ $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) systemd_export_LDADD = \ libshared.la \ $(XZ_LIBS) \ $(ZLIB_LIBS) \ - -lbz2 + $(BZIP2_LIBS) dist_libexec_DATA = \ src/import/import-pubring.gpg diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile index ae5ab76ea9..8edcf2873d 100644 --- a/src/libsystemd/libsystemd-journal-internal/Makefile +++ b/src/libsystemd/libsystemd-journal-internal/Makefile @@ -83,8 +83,11 @@ libsystemd_journal_internal_la_LIBADD += \ endif ifneq ($(HAVE_LZ4),) +libsystemd_journal_internal_la_CFLAGS += \ + $(LZ4_CFLAGS) + libsystemd_journal_internal_la_LIBADD += \ - -llz4 + $(LZ4_LIBS) endif ifneq ($(HAVE_GCRYPT),) |