summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-10-26 21:54:53 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-10-26 21:54:53 -0400
commit85cd5a4268172ce57b94f5aa097263f6e1939c64 (patch)
tree0d18c0002b170ccd2c4693e617ae21bd2b259f57
parent9973bc273d5905f27e8699431999a91545577ca3 (diff)
tidy some file locations
-rw-r--r--config.mk.in4
-rw-r--r--src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile (renamed from src/libsystemd-microhttpd/Makefile)0
-rw-r--r--src/grp-journal/grp-remote/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h (renamed from src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h)0
-rw-r--r--src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile (renamed from src/libsystemd-microhttpd/src/Makefile)0
-rw-r--r--src/grp-journal/grp-remote/libsystemd-microhttpd/src/microhttpd-util.c (renamed from src/libsystemd-microhttpd/src/microhttpd-util.c)0
-rw-r--r--src/grp-machine/libmachine-core/test/test-machine-tables.c (renamed from src/grp-machine/libmachine-core/src/test-machine-tables.c)0
6 files changed, 2 insertions, 2 deletions
diff --git a/config.mk.in b/config.mk.in
index 3af9422a1e..3d9b1881ef 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -115,8 +115,8 @@ libsystemd-blkid.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-blkid/inclu
libsystemd-blkid.DEPENDS = $(BLKID_LIBS)
libsystemd-firewall.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-firewall/include $(libsystemd-basic.CPPFLAGS)
libsystemd-firewall.DEPENDS = $(topoutdir)/src/libsystemd-firewall/src/libsystemd-firewall.la
-libsystemd-microhttpd.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-microhttpd/include $(libsystemd-basic.CPPFLAGS)
-libsystemd-microhttpd.DEPENDS = $(topoutdir)/src/libsystemd-microhttpd/src/libsystemd-microhttpd.la
+libsystemd-microhttpd.CPPFLAGS = -I$(topsrcdir)/src/grp-journal/grp-remote/libsystemd-microhttpd/include $(libsystemd-basic.CPPFLAGS)
+libsystemd-microhttpd.DEPENDS = $(topoutdir)/src/grp-journal/grp-remote/libsystemd-microhttpd/src/libsystemd-microhttpd.la
libsystemd-gcrypt.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-gcrypt/include
libsystemd-gcrypt.DEPENDS = $(topoutdir)/src/libsystemd-gcrypt/src/libsystemd-gcrypt.la
libsystemd-network.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-network/include $(libsystemd-basic.CPPFLAGS) $(libsystemd-shared.CPPFLAGS)
diff --git a/src/libsystemd-microhttpd/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile
index 15370638f2..15370638f2 100644
--- a/src/libsystemd-microhttpd/Makefile
+++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile
diff --git a/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h b/src/grp-journal/grp-remote/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
index a84bdc234a..a84bdc234a 100644
--- a/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
+++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
diff --git a/src/libsystemd-microhttpd/src/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile
index f3552b2e9a..f3552b2e9a 100644
--- a/src/libsystemd-microhttpd/src/Makefile
+++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile
diff --git a/src/libsystemd-microhttpd/src/microhttpd-util.c b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/microhttpd-util.c
index 2dc73e75e3..2dc73e75e3 100644
--- a/src/libsystemd-microhttpd/src/microhttpd-util.c
+++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/microhttpd-util.c
diff --git a/src/grp-machine/libmachine-core/src/test-machine-tables.c b/src/grp-machine/libmachine-core/test/test-machine-tables.c
index 5f50c3856b..5f50c3856b 100644
--- a/src/grp-machine/libmachine-core/src/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/test/test-machine-tables.c