From bb78769f9b1e045745bf4eb4538f3abb61f88e15 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 1 Jun 2016 13:11:27 -0400 Subject: stuff --- Makefile.am | 12 ++++++------ move.sh | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index b4fad0ff39..8ef5923a5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,7 @@ LIBUDEV_CURRENT=7 LIBUDEV_REVISION=4 LIBUDEV_AGE=6 -#@src/libsystemd/src/Makefile +#@src/libsystemd/libsystemd-internal/Makefile LIBSYSTEMD_CURRENT=14 LIBSYSTEMD_REVISION=0 LIBSYSTEMD_AGE=14 @@ -3084,7 +3084,7 @@ systemd_tty_ask_password_agent_SOURCES = \ systemd_tty_ask_password_agent_LDADD = \ libshared.la -#@src/libsystemd/src/Makefile -------------------------------------------------- +#@src/libsystemd/libsystemd-internal/Makefile ---------------------------------- libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ @@ -6424,7 +6424,7 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -#@src/libsystemd/src/Makefile +#@src/libsystemd/Makefile test-libsystemd-sym.c: \ $(top_builddir)/src/libsystemd/libsystemd.sym \ src/systemd/sd-journal.h \ @@ -6437,19 +6437,19 @@ test-libsystemd-sym.c: \ src/systemd/sd-event.h $(generate-sym-test) -#@src/libudev/src/Makefile +#@src/libudev/Makefile test-libudev-sym.c: \ src/libudev/libudev.sym \ src/udev/udev.h $(generate-sym-test) -#@src/libsystemd/src/Makefile +#@src/libsystemd/Makefile nodist_test_libsystemd_sym_SOURCES = \ test-libsystemd-sym.c test_libsystemd_sym_LDADD = \ libsystemd.la -#@src/libudev/src/Makefile +#@src/libudev/Makefile nodist_test_libudev_sym_SOURCES = \ test-libudev-sym.c test_libudev_sym_CFLAGS = \ diff --git a/move.sh b/move.sh index 384aad65a0..62afd013bc 100755 --- a/move.sh +++ b/move.sh @@ -96,6 +96,10 @@ set -e mv -T {man,src/systemd-activate}/systemd-activate.xml + mv -T src/libsystemd/{src,}/libsystemd.pc.in + mv -T src/libsystemd/{src,}/libsystemd.sym + mv -T src/libsystemd/{src,libsystemd-internal} + mkdir src/systemd-shutdown ) -- cgit v1.2.3-54-g00ecf