diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 17:24:30 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 17:24:30 -0400 |
| commit | ef98f526dafb8206cc4fd895a691eda0ea0894ec (patch) | |
| tree | 07035dd297f342c55dcf99aafa8481ebfa1fcb39 | |
| parent | 0d1eb3d488d3df70d192a2cf595967e54138d0dc (diff) | |
merge the two parts of libsystemd
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rwxr-xr-x | move.sh | 13 |
2 files changed, 10 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 0418fe6aa3..d92ed9bddc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1413,7 +1413,7 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ -#@src/libsystemd/libsystemd-journal-internal/Makefile +#@src/libsystemd/src/Makefile audit_list_includes = -include linux/audit.h -include missing.h if HAVE_AUDIT audit_list_includes += -include libaudit.h @@ -3169,7 +3169,7 @@ systemd_tty_ask_password_agent_SOURCES = \ systemd_tty_ask_password_agent_LDADD = \ libshared.la -#@src/libsystemd/libsystemd-internal/Makefile ---------------------------------- +#@src/libsystemd/src/Makefile -------------------------------------------------- libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ @@ -3346,7 +3346,7 @@ tests += \ bin_PROGRAMS += \ busctl -#@src/libsystemd/libsystemd-internal/Makefile +#@src/libsystemd/src/Makefile test_bus_marshal_SOURCES = \ src/libsystemd/sd-bus/test-bus-marshal.c @@ -3472,7 +3472,7 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la -#@src/libsystemd/libsystemd-internal/Makefile +#@src/libsystemd/src/Makefile test_resolve_SOURCES = \ src/libsystemd/sd-resolve/test-resolve.c @@ -4363,7 +4363,7 @@ tests += \ test-compress-benchmark endif # HAVE_COMPRESSION -#@src/libsystemd/libsystemd-journal-internal/Makefile +#@src/libsystemd/src/Makefile pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -6572,7 +6572,7 @@ add-key: #@src/libudev/Makefile at.subdirs += src -#@src/libsystemd/libsystemd-internal/subdir.mk +#@src/libsystemd/src/subdir.mk systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" @@ -130,7 +130,6 @@ move_files() ( mv -T src/libsystemd/{src,}/libsystemd.pc.in mv -T src/libsystemd/{src,}/libsystemd.sym mv -T src/libsystemd/{src,}/.gitignore - mv -T src/libsystemd/{src,libsystemd-internal} mkdir src/systemd-shutdown @@ -148,7 +147,7 @@ move_files() ( mkdir build-aux/Makefile.{once,each}.{head,tail} touch build-aux/Makefile.{once,each}.{head,tail}/.gitignore - mkdir src/libsystemd/libsystemd-journal-internal + mkdir src/libsystemd/src/sd-journal libsystemd_journal_files=( audit-type.c @@ -177,11 +176,11 @@ move_files() ( sd-journal.c ) for file in "${libsystemd_journal_files[@]}"; do - mv -T src/{journal,libsystemd/libsystemd-journal-internal}/$file + mv -T src/{journal,libsystemd/src/sd-journal}/$file done mkdir src/busctl - mv src/libsystemd/libsystemd-internal/sd-bus/busctl* src/busctl + mv src/libsystemd/src/sd-bus/busctl* src/busctl mv -T src/{udev,libudev/src}/udev.h @@ -190,10 +189,6 @@ move_files() ( mkdir src/grp-timedate/timedatectl mv -T src/grp-timedate/{systemd-timedated,timedatectl}/timedatectl.c - mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/local-addresses.c - mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/local-addresses.h - mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/test-local-addresses.c - mv -T src/{journal,grp-journal} mv -T {,src/grp-journal/}catalog mkdir src/grp-journal/{systemd-journald,journalctl,libjournal-core} @@ -325,7 +320,7 @@ fixup_makefiles() ( -e 's/ \$\(AM_CPPFLAGS\) / $(ALL_CPPFLAGS) /g' \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ src/libbasic/Makefile \ - src/libsystemd/libsystemd-journal-internal/Makefile \ + src/libsystemd/src/Makefile \ src/grp-udev/libudev-core/Makefile find -type f -name Makefile|while read -r filename; do sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename" |