summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-03-25 22:30:24 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-15 22:23:47 -0400
commit1e4e7b71e1938daa9b2b9718a9f54c69017a9ef5 (patch)
treed133142bfb49ad0f6c5e0bd50313867672e9a726
parent5937a4d4f263a5a3254e081c6dbb1ea2f860d471 (diff)
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.
-rw-r--r--Makefile.am22
l---------src/journal-remote/Makefile1
-rw-r--r--src/journal-remote/browse.html (renamed from src/journal/browse.html)0
-rw-r--r--src/journal-remote/journal-gatewayd.c (renamed from src/journal/journal-gatewayd.c)0
-rw-r--r--src/journal-remote/journal-remote-parse.c (renamed from src/journal/journal-remote-parse.c)0
-rw-r--r--src/journal-remote/journal-remote-parse.h (renamed from src/journal/journal-remote-parse.h)0
-rw-r--r--src/journal-remote/journal-remote-write.c (renamed from src/journal/journal-remote-write.c)0
-rw-r--r--src/journal-remote/journal-remote-write.h (renamed from src/journal/journal-remote-write.h)0
-rw-r--r--src/journal-remote/journal-remote.c (renamed from src/journal/journal-remote.c)0
-rw-r--r--src/journal-remote/microhttpd-util.c (renamed from src/journal/microhttpd-util.c)0
-rw-r--r--src/journal-remote/microhttpd-util.h (renamed from src/journal/microhttpd-util.h)0
11 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index ff64cbff0a..4a698c88db 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 0000000000..d0b0e8e008
--- /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
index 3594f70c87..3594f70c87 100644
--- a/src/journal/browse.html
+++ b/src/journal-remote/browse.html
diff --git a/src/journal/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index db07700111..db07700111 100644
--- a/src/journal/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
diff --git a/src/journal/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
index dbdf02aa3c..dbdf02aa3c 100644
--- a/src/journal/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
diff --git a/src/journal/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
index c1506d118d..c1506d118d 100644
--- a/src/journal/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
diff --git a/src/journal/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index 4d142bdc97..4d142bdc97 100644
--- a/src/journal/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
diff --git a/src/journal/journal-remote-write.h b/src/journal-remote/journal-remote-write.h
index 8798216415..8798216415 100644
--- a/src/journal/journal-remote-write.h
+++ b/src/journal-remote/journal-remote-write.h
diff --git a/src/journal/journal-remote.c b/src/journal-remote/journal-remote.c
index 9db4692a28..9db4692a28 100644
--- a/src/journal/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
diff --git a/src/journal/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index d0466867b7..d0466867b7 100644
--- a/src/journal/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
diff --git a/src/journal/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
index 4186da888e..4186da888e 100644
--- a/src/journal/microhttpd-util.h
+++ b/src/journal-remote/microhttpd-util.h