diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rwxr-xr-x | move.sh | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 75864e0c73..8545419c1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4991,7 +4991,6 @@ lib_LTLIBRARIES += \ endif # HAVE_MYHOSTNAME #@src/grp-machine/systemd-machined/Makefile ------------------------------------ -if ENABLE_MACHINED systemd_machined_SOURCES = \ src/machine/machined.c \ src/machine/machined.h @@ -5002,6 +5001,7 @@ systemd_machined_LDADD = \ rootlibexec_PROGRAMS += \ systemd-machined +#@src/grp-machine/libmachine-core/Makefile libmachine_core_la_SOURCES = \ src/machine/machine.c \ src/machine/machine.h \ @@ -5017,6 +5017,7 @@ libmachine_core_la_LIBADD = \ noinst_LTLIBRARIES += \ libmachine-core.la +#@src/grp-machine/machinectl/Makefile machinectl_SOURCES = \ src/machine/machinectl.c @@ -5026,6 +5027,7 @@ machinectl_LDADD = \ rootbin_PROGRAMS += \ machinectl +#@src/grp-machine/libmachine-core/Makefile test_machine_tables_SOURCES = \ src/machine/test-machine-tables.c @@ -5035,6 +5037,7 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables +#@src/grp-machine/systemd-machined/Makefile nodist_systemunit_DATA += \ units/systemd-machined.service @@ -5053,6 +5056,7 @@ dist_dbuspolicy_DATA += \ polkitpolicy_files += \ src/machine/org.freedesktop.machine1.policy +#@src/grp-machine/machinectl/Makefile dist_bashcompletion_data += \ shell-completion/bash/machinectl @@ -5060,15 +5064,14 @@ dist_zshcompletion_data += \ shell-completion/zsh/_machinectl \ shell-completion/zsh/_sd_machines +#@src/grp-machine/systemd-machined/Makefile SYSTEM_UNIT_ALIASES += \ systemd-machined.service dbus-org.freedesktop.machine1.service BUSNAMES_TARGET_WANTS += \ org.freedesktop.machine1.busname -endif # ENABLE_MACHINED #@src/grp-machine/nss-mymachines/Makefile -if ENABLE_MACHINED libnss_mymachines_la_SOURCES = \ src/nss-mymachines/nss-mymachines.sym \ @@ -5089,7 +5092,6 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la -endif # ENABLE_MACHINED #@src/grp-machine/systemd-machined/Makefile polkitpolicy_in_files += \ @@ -84,7 +84,12 @@ move_files() ( mv -T src/{,libsystemd/include}/systemd mkdir src/grp-machine - mv -T src/{machine,grp-machine/systemd-machined} + mv -T src/machine src/grp-machine/libmachine-core + mkdir src/grp-machine/systemd-machined + mv -T src/grp-machine/{libmachine-core,systemd-machined}/machined.c + mv -T src/grp-machine/{libmachine-core,systemd-machined}/machined.h + mkdir src/grp-machine/machinectl + mv -T src/grp-machine/{libmachine-core,machinectl}/machinectl.c mv -T src/{,grp-machine}/nss-mymachines mkdir src/grp-resolve |