tests: cleanup Makefile

src/tests/Makefile.am

@@ -2,39 +2,39 @@ if ENABLE_TESTS
 
 LDADD = ../lxc/liblxc.la
 
+lxc_test_api_reboot_SOURCES = api_reboot.c
+lxc_test_apparmor_SOURCES = aa.c
+lxc_test_attach_SOURCES = attach.c
 lxc_test_basic_SOURCES = basic.c
-lxc_test_containertests_SOURCES = containertests.c
-lxc_test_locktests_SOURCES = locktests.c
-lxc_test_startone_SOURCES = startone.c
-lxc_test_destroytest_SOURCES = destroytest.c
-lxc_test_saveconfig_SOURCES = saveconfig.c
-lxc_test_createtest_SOURCES = createtest.c
-lxc_test_shutdowntest_SOURCES = shutdowntest.c
-lxc_test_get_item_SOURCES = get_item.c
-lxc_test_getkeys_SOURCES = getkeys.c
-lxc_test_lxcpath_SOURCES = lxcpath.c
 lxc_test_cgpath_SOURCES = cgpath.c
 lxc_test_clonetest_SOURCES = clonetest.c
+lxc_test_concurrent_SOURCES = concurrent.c
+lxc_test_config_jump_table_SOURCES = config_jump_table.c lxctest.h
 lxc_test_console_SOURCES = console.c
 lxc_test_console_log_SOURCES = console_log.c lxctest.h
-lxc_test_snapshot_SOURCES = snapshot.c
-lxc_test_concurrent_SOURCES = concurrent.c
-lxc_test_may_control_SOURCES = may_control.c
-lxc_test_reboot_SOURCES = reboot.c
-lxc_test_api_reboot_SOURCES = api_reboot.c
-lxc_test_list_SOURCES = list.c
-lxc_test_attach_SOURCES = attach.c
+lxc_test_containertests_SOURCES = containertests.c
+lxc_test_createtest_SOURCES = createtest.c
+lxc_test_criu_check_feature_SOURCES = criu_check_feature.c lxctest.h
+lxc_test_destroytest_SOURCES = destroytest.c
 lxc_test_device_add_remove_SOURCES = device_add_remove.c
-lxc_test_apparmor_SOURCES = aa.c
-lxc_test_utils_SOURCES = lxc-test-utils.c lxctest.h
+lxc_test_getkeys_SOURCES = getkeys.c
+lxc_test_get_item_SOURCES = get_item.c
+lxc_test_list_SOURCES = list.c
+lxc_test_locktests_SOURCES = locktests.c
+lxc_test_lxcpath_SOURCES = lxcpath.c
+lxc_test_may_control_SOURCES = may_control.c
+lxc_test_mount_injection_SOURCES = mount_injection.c lxctest.h
 lxc_test_parse_config_file_SOURCES = parse_config_file.c lxctest.h
-lxc_test_config_jump_table_SOURCES = config_jump_table.c lxctest.h
+lxc_test_raw_clone_SOURCES = lxc_raw_clone.c lxctest.h
+lxc_test_reboot_SOURCES = reboot.c
+lxc_test_saveconfig_SOURCES = saveconfig.c
+lxc_test_share_ns_SOURCES = share_ns.c lxctest.h
 lxc_test_shortlived_SOURCES = shortlived.c
+lxc_test_shutdowntest_SOURCES = shutdowntest.c
+lxc_test_snapshot_SOURCES = snapshot.c
+lxc_test_startone_SOURCES = startone.c
 lxc_test_state_server_SOURCES = state_server.c lxctest.h
-lxc_test_share_ns_SOURCES = share_ns.c lxctest.h
-lxc_test_criu_check_feature_SOURCES = criu_check_feature.c lxctest.h
-lxc_test_raw_clone_SOURCES = lxc_raw_clone.c lxctest.h
-lxc_test_mount_injection_SOURCES = mount_injection.c lxctest.h
+lxc_test_utils_SOURCES = lxc-test-utils.c lxctest.h
 
 AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
 	  -DLXCPATH=\"$(LXCPATH)\" \
@@ -57,17 +57,39 @@ if ENABLE_SELINUX
 AM_CFLAGS += -DHAVE_SELINUX
 endif
 
-bin_PROGRAMS = lxc-test-containertests lxc-test-locktests lxc-test-startone \
-	lxc-test-destroytest lxc-test-saveconfig lxc-test-createtest \
-	lxc-test-shutdowntest lxc-test-get_item lxc-test-getkeys lxc-test-lxcpath \
-	lxc-test-cgpath lxc-test-clonetest lxc-test-console lxc-test-console-log \
-	lxc-test-snapshot lxc-test-concurrent lxc-test-may-control \
-	lxc-test-reboot lxc-test-list lxc-test-attach lxc-test-device-add-remove \
-	lxc-test-apparmor lxc-test-utils lxc-test-parse-config-file \
-	lxc-test-config-jump-table lxc-test-shortlived \
-	lxc-test-api-reboot lxc-test-state-server lxc-test-share-ns \
-	lxc-test-criu-check-feature lxc-test-raw-clone \
-	lxc-test-mount-injection lxc-test-basic
+bin_PROGRAMS = lxc-test-api-reboot \
+	       lxc-test-apparmor \
+	       lxc-test-attach \
+	       lxc-test-basic \
+	       lxc-test-cgpath \
+	       lxc-test-clonetest \
+	       lxc-test-concurrent \
+	       lxc-test-config-jump-table \
+	       lxc-test-console \
+	       lxc-test-console-log \
+	       lxc-test-containertests \
+	       lxc-test-createtest \
+	       lxc-test-criu-check-feature \
+	       lxc-test-destroytest \
+	       lxc-test-device-add-remove \
+	       lxc-test-getkeys \
+	       lxc-test-get_item \
+	       lxc-test-list \
+	       lxc-test-locktests \
+	       lxc-test-lxcpath \
+	       lxc-test-may-control \
+	       lxc-test-mount-injection \
+	       lxc-test-parse-config-file \
+	       lxc-test-raw-clone \
+	       lxc-test-reboot \
+	       lxc-test-saveconfig \
+	       lxc-test-share-ns \
+	       lxc-test-shortlived \
+	       lxc-test-shutdowntest \
+	       lxc-test-snapshot \
+	       lxc-test-startone \
+	       lxc-test-state-server \
+	       lxc-test-utils
 
 bin_SCRIPTS =
 if ENABLE_TOOLS
@@ -79,8 +101,7 @@ bin_SCRIPTS += lxc-test-automount \
 	       lxc-test-rootfs
 
 if DISTRO_UBUNTU
-bin_SCRIPTS += \
-	lxc-test-lxc-attach \
+bin_SCRIPTS += lxc-test-lxc-attach \
 	       lxc-test-apparmor-mount \
 	       lxc-test-apparmor-generated \
 	       lxc-test-checkpoint-restore \
@@ -93,8 +114,7 @@ endif
 
 endif
 
-EXTRA_DIST = \
-	basic.c \
+EXTRA_DIST = basic.c \
 	     cgpath.c \
 	     clonetest.c \
 	     concurrent.c \