diff options
| author | Daniel Mack <github@zonque.org> | 2016-03-18 13:48:00 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-03-18 13:48:00 +0100 |
| commit | 9d74d73a4dba44ec9ca40eb018afbf2683f3cc32 (patch) | |
| tree | bbdae2da06183c11d5379051ef732c2cd93a44fd | |
| parent | af6cd87d986312963873afd0262e710d49ac0f5a (diff) | |
| parent | 2adeb166daee2a5d002cc0ccf0d96bcc6bdf04fb (diff) | |
| download | systemd-9d74d73a4dba44ec9ca40eb018afbf2683f3cc32.tar.gz | |
Merge pull request #2865 from utezduyar/journald-upload
journal-upload: remove microhttpd dependency
| -rw-r--r-- | Makefile.am | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 97e2c26442..cc06350c9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3945,6 +3945,34 @@ systemd_cat_SOURCES = \ systemd_cat_LDADD = \ libjournal-core.la +if HAVE_LIBCURL +rootlibexec_PROGRAMS += \ + systemd-journal-upload + +systemd_journal_upload_SOURCES = \ + src/journal-remote/journal-upload.h \ + src/journal-remote/journal-upload.c \ + src/journal-remote/journal-upload-journal.c + +systemd_journal_upload_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) + +systemd_journal_upload_LDADD = \ + libshared.la \ + $(LIBCURL_LIBS) + +nodist_systemunit_DATA += \ + units/systemd-journal-upload.service + +nodist_pkgsysconf_DATA += \ + src/journal-remote/journal-upload.conf +endif + +EXTRA_DIST += \ + units/systemd-journal-upload.service.in \ + src/journal-remote/journal-upload.conf.in + if HAVE_MICROHTTPD rootlibexec_PROGRAMS += \ systemd-journal-remote @@ -4004,34 +4032,6 @@ EXTRA_DIST += \ src/journal-remote/log-generator.py endif -if HAVE_LIBCURL -rootlibexec_PROGRAMS += \ - systemd-journal-upload - -systemd_journal_upload_SOURCES = \ - src/journal-remote/journal-upload.h \ - src/journal-remote/journal-upload.c \ - src/journal-remote/journal-upload-journal.c - -systemd_journal_upload_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBCURL_CFLAGS) - -systemd_journal_upload_LDADD = \ - libshared.la \ - $(LIBCURL_LIBS) - -nodist_systemunit_DATA += \ - units/systemd-journal-upload.service - -nodist_pkgsysconf_DATA += \ - src/journal-remote/journal-upload.conf -endif - -EXTRA_DIST += \ - units/systemd-journal-upload.service.in \ - src/journal-remote/journal-upload.conf.in - # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ $(AM_CFLAGS) |