From 1e4e7b71e1938daa9b2b9718a9f54c69017a9ef5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 25 Mar 2014 22:30:24 -0400 Subject: [PATCH] Move network-related journal programs to src/journal-remote/ Directory src/journal has become one of the largest directories, and since systemd-journal-gatewayd, systemd-journal-remote, and forthcoming systemd-journal-upload are all closely related, create a separate directory for them. --- Makefile.am | 22 +++++++++---------- src/journal-remote/Makefile | 1 + src/{journal => journal-remote}/browse.html | 0 .../journal-gatewayd.c | 0 .../journal-remote-parse.c | 0 .../journal-remote-parse.h | 0 .../journal-remote-write.c | 0 .../journal-remote-write.h | 0 .../journal-remote.c | 0 .../microhttpd-util.c | 0 .../microhttpd-util.h | 0 11 files changed, 12 insertions(+), 11 deletions(-) create mode 120000 src/journal-remote/Makefile rename src/{journal => journal-remote}/browse.html (100%) rename src/{journal => journal-remote}/journal-gatewayd.c (100%) rename src/{journal => journal-remote}/journal-remote-parse.c (100%) rename src/{journal => journal-remote}/journal-remote-parse.h (100%) rename src/{journal => journal-remote}/journal-remote-write.c (100%) rename src/{journal => journal-remote}/journal-remote-write.h (100%) rename src/{journal => journal-remote}/journal-remote.c (100%) rename src/{journal => journal-remote}/microhttpd-util.c (100%) rename src/{journal => journal-remote}/microhttpd-util.h (100%) diff --git a/Makefile.am b/Makefile.am index ff64cbff0..4a698c88d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3449,19 +3449,19 @@ rootlibexec_PROGRAMS += \ systemd-journal-remote systemd_journal_remote_SOURCES = \ - src/journal/journal-remote-parse.h \ - src/journal/journal-remote-parse.c \ - src/journal/journal-remote-write.h \ - src/journal/journal-remote-write.c \ - src/journal/journal-remote.c + src/journal-remote/journal-remote-parse.h \ + src/journal-remote/journal-remote-parse.c \ + src/journal-remote/journal-remote-write.h \ + src/journal-remote/journal-remote-write.c \ + src/journal-remote/journal-remote.c systemd_journal_remote_LDADD = \ libsystemd-internal.la \ libsystemd-journal-core.la systemd_journal_remote_SOURCES += \ - src/journal/microhttpd-util.h \ - src/journal/microhttpd-util.c + src/journal-remote/microhttpd-util.h \ + src/journal-remote/microhttpd-util.c systemd_journal_remote_CFLAGS = \ $(AM_CFLAGS) \ @@ -3803,9 +3803,9 @@ rootlibexec_PROGRAMS += \ systemd-journal-gatewayd systemd_journal_gatewayd_SOURCES = \ - src/journal/journal-gatewayd.c \ - src/journal/microhttpd-util.h \ - src/journal/microhttpd-util.c + src/journal-remote/journal-gatewayd.c \ + src/journal-remote/microhttpd-util.h \ + src/journal-remote/microhttpd-util.c systemd_journal_gatewayd_LDADD = \ libsystemd-logs.la \ @@ -3834,7 +3834,7 @@ nodist_systemunit_DATA += \ units/systemd-journal-gatewayd.service dist_gatewayddocumentroot_DATA = \ - src/journal/browse.html + src/journal-remote/browse.html endif diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile new file mode 120000 index 000000000..d0b0e8e00 --- /dev/null +++ b/src/journal-remote/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/journal/browse.html b/src/journal-remote/browse.html similarity index 100% rename from src/journal/browse.html rename to src/journal-remote/browse.html diff --git a/src/journal/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c similarity index 100% rename from src/journal/journal-gatewayd.c rename to src/journal-remote/journal-gatewayd.c diff --git a/src/journal/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c similarity index 100% rename from src/journal/journal-remote-parse.c rename to src/journal-remote/journal-remote-parse.c diff --git a/src/journal/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h similarity index 100% rename from src/journal/journal-remote-parse.h rename to src/journal-remote/journal-remote-parse.h diff --git a/src/journal/journal-remote-write.c b/src/journal-remote/journal-remote-write.c similarity index 100% rename from src/journal/journal-remote-write.c rename to src/journal-remote/journal-remote-write.c diff --git a/src/journal/journal-remote-write.h b/src/journal-remote/journal-remote-write.h similarity index 100% rename from src/journal/journal-remote-write.h rename to src/journal-remote/journal-remote-write.h diff --git a/src/journal/journal-remote.c b/src/journal-remote/journal-remote.c similarity index 100% rename from src/journal/journal-remote.c rename to src/journal-remote/journal-remote.c diff --git a/src/journal/microhttpd-util.c b/src/journal-remote/microhttpd-util.c similarity index 100% rename from src/journal/microhttpd-util.c rename to src/journal-remote/microhttpd-util.c diff --git a/src/journal/microhttpd-util.h b/src/journal-remote/microhttpd-util.h similarity index 100% rename from src/journal/microhttpd-util.h rename to src/journal-remote/microhttpd-util.h -- 2.30.2