Skip to content

L
lxc
Unverified Commit 50baaba7 by Christian Brauner
Options

autotools: cleanup Makefile.am

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 6a5d4f8c
Showing with 144 additions and 110 deletions
src/lxc/Makefile.am
pkginclude_HEADERS = \ pkginclude_HEADERS = attach_options.h \
attach_options.h \
lxccontainer.h \ lxccontainer.h \
version.h version.h
noinst_HEADERS = \ noinst_HEADERS = attach.h \
attach.h \ caps.h \
storage/storage.h \
storage/btrfs.h \
storage/dir.h \
storage/loop.h \
storage/lvm.h \
storage/nbd.h \
storage/overlay.h \
storage/rbd.h \
storage/rsync.h \
storage/zfs.h \
storage/storage_utils.h \
tools/arguments.h \
cgroups/cgroup.h \ cgroups/cgroup.h \
cgroups/cgroup_utils.h \ cgroups/cgroup_utils.h \
caps.h \
conf.h \ conf.h \
confile.h \ confile.h \
confile_utils.h \ confile_utils.h \
criu.h \
error.h \ error.h \
initutils.h \ initutils.h \
list.h \ list.h \
...@@ -33,16 +20,26 @@ noinst_HEADERS = \ ...@@ -33,16 +20,26 @@ noinst_HEADERS = \
namespace.h \ namespace.h \
start.h \ start.h \
state.h \ state.h \
storage/btrfs.h \
storage/dir.h \
storage/loop.h \
storage/lvm.h \
storage/nbd.h \
storage/overlay.h \
storage/rbd.h \
storage/rsync.h \
storage/storage.h \
storage/storage_utils.h \
storage/zfs.h \
terminal.h \ terminal.h \
utils.h \ ../tests/lxctest.h \
criu.h \ tools/arguments.h \
../tests/lxctest.h utils.h
if IS_BIONIC if IS_BIONIC
noinst_HEADERS += \ noinst_HEADERS += ../include/ifaddrs.h \
../include/ifaddrs.h \ ../include/lxcmntent.h \
../include/openpty.h \ ../include/openpty.h
../include/lxcmntent.h
endif endif
if !HAVE_PRLIMIT if !HAVE_PRLIMIT
...@@ -67,9 +64,9 @@ endif ...@@ -67,9 +64,9 @@ endif
sodir=$(libdir) sodir=$(libdir)
LSM_SOURCES = \ LSM_SOURCES = lsm/lsm.c \
lsm/nop.c \ lsm/lsm.h \
lsm/lsm.h lsm/lsm.c lsm/nop.c
if ENABLE_APPARMOR if ENABLE_APPARMOR
LSM_SOURCES += lsm/apparmor.c LSM_SOURCES += lsm/apparmor.c
...@@ -80,65 +77,63 @@ LSM_SOURCES += lsm/selinux.c ...@@ -80,65 +77,63 @@ LSM_SOURCES += lsm/selinux.c
endif endif
lib_LTLIBRARIES = liblxc.la lib_LTLIBRARIES = liblxc.la
liblxc_la_SOURCES = \ liblxc_la_SOURCES = af_unix.c af_unix.h \
storage/storage.c storage/storage.h \ attach.c attach.h \
storage/btrfs.c storage/btrfs.h \ caps.c caps.h \
storage/dir.c storage/dir.h \
storage/loop.c storage/loop.h \
storage/lvm.c storage/lvm.h \
storage/nbd.c storage/nbd.h \
storage/overlay.c storage/overlay.h \
storage/rbd.c storage/rbd.h \
storage/rsync.c storage/rsync.h \
storage/zfs.c storage/zfs.h \
storage/storage_utils.c storage/storage_utils.h \
cgroups/cgfsng.c \ cgroups/cgfsng.c \
cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
cgroups/cgroup.c cgroups/cgroup.h \ cgroups/cgroup.c cgroups/cgroup.h \
cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
commands.c commands.h \ commands.c commands.h \
commands_utils.c commands_utils.h \ commands_utils.c commands_utils.h \
start.c start.h \
execute.c \
monitor.c monitor.h \
terminal.c \
freezer.c \
error.h error.c \
parse.c parse.h \
lxc.h \
initutils.c initutils.h \
utils.c utils.h \
sync.c sync.h \
namespace.h namespace.c \
conf.c conf.h \ conf.c conf.h \
confile.c confile.h \ confile.c confile.h \
confile_utils.c confile_utils.h \ confile_utils.c confile_utils.h \
criu.c criu.h \
error.c error.h \
execute.c \
freezer.c \
initutils.c initutils.h \
list.h \ list.h \
state.c state.h \
log.c log.h \ log.c log.h \
attach.c attach.h \ lxc.h \
criu.c criu.h \ lxccontainer.c lxccontainer.h \
ringbuf.c ringbuf.h \ lxclock.c lxclock.h \
\
network.c network.h \
nl.c nl.h \
rtnl.c rtnl.h \
\
caps.c caps.h \
lxcseccomp.h \ lxcseccomp.h \
mainloop.c mainloop.h \ mainloop.c mainloop.h \
af_unix.c af_unix.h \ namespace.c namespace.h \
\ nl.c nl.h \
lxclock.h lxclock.c \ network.c network.h \
lxccontainer.c lxccontainer.h \ monitor.c monitor.h \
parse.c parse.h \
ringbuf.c ringbuf.h \
rtnl.c rtnl.h \
state.c state.h \
start.c start.h \
storage/btrfs.c storage/btrfs.h \
storage/dir.c storage/dir.h \
storage/loop.c storage/loop.h \
storage/lvm.c storage/lvm.h \
storage/nbd.c storage/nbd.h \
storage/overlay.c storage/overlay.h \
storage/rbd.c storage/rbd.h \
storage/rsync.c storage/rsync.h \
storage/storage.c storage/storage.h \
storage/storage_utils.c storage/storage_utils.h \
storage/zfs.c storage/zfs.h \
sync.c sync.h \
terminal.c \
utils.c utils.h \
version.h \ version.h \
\
$(LSM_SOURCES) $(LSM_SOURCES)
if IS_BIONIC if IS_BIONIC
liblxc_la_SOURCES += \ liblxc_la_SOURCES += ../include/ifaddrs.c ../include/ifaddrs.h \
../include/ifaddrs.c ../include/ifaddrs.h \ ../include/lxcmntent.c ../include/lxcmntent.h \
../include/openpty.c ../include/openpty.h \ ../include/openpty.c ../include/openpty.h
../include/lxcmntent.c ../include/lxcmntent.h endif
if !HAVE_GETGRGID_R
liblxc_la_SOURCES += ../include/getgrgid_r.c ../include/getgrgid_r.h
endif endif
if !HAVE_GETLINE if !HAVE_GETLINE
...@@ -165,11 +160,7 @@ if !HAVE_STRLCAT ...@@ -165,11 +160,7 @@ if !HAVE_STRLCAT
liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h
endif endif
if !HAVE_GETGRGID_R AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
liblxc_la_SOURCES += ../include/getgrgid_r.c ../include/getgrgid_r.h
endif
AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
-DLXCPATH=\"$(LXCPATH)\" \ -DLXCPATH=\"$(LXCPATH)\" \
-DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \ -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-DLXCINITDIR=\"$(LXCINITDIR)\" \ -DLXCINITDIR=\"$(LXCINITDIR)\" \
...@@ -197,7 +188,8 @@ AM_CFLAGS += -DHAVE_LIBGNUTLS ...@@ -197,7 +188,8 @@ AM_CFLAGS += -DHAVE_LIBGNUTLS
endif endif
if ENABLE_SECCOMP if ENABLE_SECCOMP
AM_CFLAGS += -DHAVE_SECCOMP $(SECCOMP_CFLAGS) AM_CFLAGS += -DHAVE_SECCOMP \
$(SECCOMP_CFLAGS)
endif endif
if ENABLE_SELINUX if ENABLE_SELINUX
...@@ -231,8 +223,7 @@ bin_SCRIPTS += cmd/lxc-checkconfig \ ...@@ -231,8 +223,7 @@ bin_SCRIPTS += cmd/lxc-checkconfig \
endif endif
if ENABLE_TOOLS if ENABLE_TOOLS
bin_PROGRAMS = \ bin_PROGRAMS = lxc-attach \
lxc-attach \
lxc-autostart \ lxc-autostart \
lxc-cgroup \ lxc-cgroup \
lxc-checkpoint \ lxc-checkpoint \
...@@ -259,47 +250,78 @@ endif ...@@ -259,47 +250,78 @@ endif
if ENABLE_COMMANDS if ENABLE_COMMANDS
sbin_PROGRAMS = init.lxc sbin_PROGRAMS = init.lxc
pkglibexec_PROGRAMS = \
lxc-monitord \ pkglibexec_PROGRAMS = lxc-monitord \
lxc-user-nic lxc-user-nic
endif endif
AM_LDFLAGS = -Wl,-E AM_LDFLAGS = -Wl,-E
if ENABLE_RPATH if ENABLE_RPATH
AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir) AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir)
endif endif
LDADD=liblxc.la @CAP_LIBS@ @GNUTLS_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@
LDADD = liblxc.la \
@CAP_LIBS@ \
@GNUTLS_LIBS@ \
@SECCOMP_LIBS@ \
@SELINUX_LIBS@
if ENABLE_TOOLS if ENABLE_TOOLS
lxc_attach_SOURCES = tools/lxc_attach.c tools/arguments.c lxc_attach_SOURCES = tools/lxc_attach.c \
lxc_autostart_SOURCES = tools/lxc_autostart.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_cgroup_SOURCES = tools/lxc_cgroup.c tools/arguments.c lxc_autostart_SOURCES = tools/lxc_autostart.c \
lxc_config_SOURCES = tools/lxc_config.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_console_SOURCES = tools/lxc_console.c tools/arguments.c lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
lxc_destroy_SOURCES = tools/lxc_destroy.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_device_SOURCES = tools/lxc_device.c tools/arguments.c lxc_config_SOURCES = tools/lxc_config.c \
lxc_execute_SOURCES = tools/lxc_execute.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_freeze_SOURCES = tools/lxc_freeze.c tools/arguments.c lxc_console_SOURCES = tools/lxc_console.c \
lxc_info_SOURCES = tools/lxc_info.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_monitor_SOURCES = tools/lxc_monitor.c tools/arguments.c lxc_destroy_SOURCES = tools/lxc_destroy.c \
lxc_ls_SOURCES = tools/lxc_ls.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_copy_SOURCES = tools/lxc_copy.c tools/arguments.c lxc_device_SOURCES = tools/lxc_device.c \
lxc_start_SOURCES = tools/lxc_start.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_stop_SOURCES = tools/lxc_stop.c tools/arguments.c lxc_execute_SOURCES = tools/lxc_execute.c \
lxc_top_SOURCES = tools/lxc_top.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c tools/arguments.c lxc_freeze_SOURCES = tools/lxc_freeze.c \
lxc_unshare_SOURCES = tools/lxc_unshare.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_wait_SOURCES = tools/lxc_wait.c tools/arguments.c lxc_info_SOURCES = tools/lxc_info.c \
lxc_create_SOURCES = tools/lxc_create.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_snapshot_SOURCES = tools/lxc_snapshot.c tools/arguments.c lxc_monitor_SOURCES = tools/lxc_monitor.c \
lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c tools/arguments.c tools/arguments.c tools/arguments.h
lxc_ls_SOURCES = tools/lxc_ls.c \
tools/arguments.c tools/arguments.h
lxc_copy_SOURCES = tools/lxc_copy.c \
tools/arguments.c tools/arguments.h
lxc_start_SOURCES = tools/lxc_start.c \
tools/arguments.c tools/arguments.h
lxc_stop_SOURCES = tools/lxc_stop.c \
tools/arguments.c tools/arguments.h
lxc_top_SOURCES = tools/lxc_top.c \
tools/arguments.c tools/arguments.h
lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
tools/arguments.c tools/arguments.h
lxc_unshare_SOURCES = tools/lxc_unshare.c \
tools/arguments.c tools/arguments.h
lxc_wait_SOURCES = tools/lxc_wait.c \
tools/arguments.c tools/arguments.h
lxc_create_SOURCES = tools/lxc_create.c \
tools/arguments.c tools/arguments.h
lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
tools/arguments.c tools/arguments.h
lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
tools/arguments.c tools/arguments.h
endif endif
if ENABLE_COMMANDS if ENABLE_COMMANDS
# Binaries shipping with liblxc # Binaries shipping with liblxc
init_lxc_SOURCES = cmd/lxc_init.c init_lxc_SOURCES = cmd/lxc_init.c
lxc_monitord_SOURCES = cmd/lxc_monitord.c lxc_monitord_SOURCES = cmd/lxc_monitord.c
lxc_user_nic_SOURCES = cmd/lxc_user_nic.c namespace.c network.c parse.c lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
namespace.c namespace.h \
network.c network.h \
parse.c parse.h
lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c
endif endif
...@@ -314,11 +336,17 @@ if ENABLE_COMMANDS ...@@ -314,11 +336,17 @@ if ENABLE_COMMANDS
if HAVE_STATIC_LIBCAP if HAVE_STATIC_LIBCAP
sbin_PROGRAMS += init.lxc.static sbin_PROGRAMS += init.lxc.static
init_lxc_static_SOURCES = cmd/lxc_init.c error.c log.c initutils.c caps.c parse.c namespace.c init_lxc_static_SOURCES = cmd/lxc_init.c \
caps.c caps.h \
error.c error.h \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
parse.c parse.h
if !HAVE_GETLINE if !HAVE_GETLINE
if HAVE_FGETLN if HAVE_FGETLN
init_lxc_static_SOURCES += ../include/getline.c init_lxc_static_SOURCES += ../include/getline.c ../include/getline.h
endif endif
endif endif
...@@ -339,10 +367,16 @@ endif ...@@ -339,10 +367,16 @@ endif
if ENABLE_PAM if ENABLE_PAM
if HAVE_PAM if HAVE_PAM
pam_LTLIBRARIES = pam_cgfs.la pam_LTLIBRARIES = pam_cgfs.la
pam_cgfs_la_SOURCES = pam/pam_cgfs.c pam/utils.c pam/utils.h pam_cgfs_la_SOURCES = pam/pam_cgfs.c \
pam/utils.c pam/utils.h
pam_cgfs_la_CFLAGS = $(AM_CFLAGS) pam_cgfs_la_CFLAGS = $(AM_CFLAGS)
pam_cgfs_la_LIBADD = $(AM_LIBS) $(PAM_LIBS) -L$(top_srcdir) pam_cgfs_la_LIBADD = $(AM_LIBS) \
pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared $(PAM_LIBS) \
-L$(top_srcdir)
pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \
-avoid-version \
-module \
-shared
endif endif
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment