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.

diff --git a/Makefile.am b/Makefile.am
index ff64cbff0afaacecd009f0c3bfba8346f2b159d1..4a698c88dbb4b728699cb40a4d40bd45bf646d1a 100644 (file)
--- 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 (symlink)
index 0000000..d0b0e8e
--- /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