From 46565171d49814f56b340d8cd28d7a855cad8dee Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 27 Jul 2016 23:53:29 -0400 Subject: split libshared src and include --- Makefile.am | 2 ++ move.sh | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index eca7e59435..bb232871d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1041,6 +1041,8 @@ libbasic_la_LIBADD = \ -lm #@src/libshared/Makefile ------------------------------------------------------- +at.subdirs += src +#@src/libshared/src/Makefile noinst_LTLIBRARIES += \ libshared.la diff --git a/move.sh b/move.sh index 0808720e44..9a420b344c 100755 --- a/move.sh +++ b/move.sh @@ -26,6 +26,18 @@ move_files() ( mkdir src/libbasic/include/basic mv src/libbasic/.gitignore src/libbasic/*.h src/libbasic/include/basic/ + mv -T src/lib{shared,core}/linux + + mkdir src/libfirewall + mv -T src/lib{shared,firewall}/firewall-util.c + mv -T src/lib{shared,firewall}/firewall-util.h + + mkdir src/libshared/src + mv src/libshared/*.c src/libshared/src/ + mkdir src/libshared/include + mkdir src/libshared/include/shared + mv src/libshared/*.h src/libshared/include/shared/ + pfix=( dbus1-generator debug-generator @@ -95,8 +107,6 @@ move_files() ( mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install mv -T {man,src/kernel-install}/kernel-install.xml - mv -T src/lib{shared,core}/linux - mkdir src/libsystemd/include mv -T src/{,libsystemd/include}/systemd @@ -115,10 +125,6 @@ move_files() ( mkdir src/grp-system mv -T src/{,grp-system}/systemctl - mkdir src/libfirewall - mv -T src/lib{shared,firewall}/firewall-util.c - mv -T src/lib{shared,firewall}/firewall-util.h - mkdir src/grp-system/systemd mv -T src/{libcore,grp-system/systemd}/main.c mv -T src/{libcore,grp-system/systemd}/macros.systemd.in -- cgit v1.2.3-54-g00ecf