From 94bc7b14f30be7071ae3e1a871469d779042a30b Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Sat, 26 May 2018 00:15:48 -0700 Subject: [PATCH] [makefile] sort filename lists in alphabetical order (#2746) --- src/cli/Makefile.am | 6 +++--- src/core/Makefile.am | 27 ++++++++++++++------------- src/ncp/Makefile.am | 22 +++++++++++----------- tests/unit/Makefile.am | 26 +++++++++++++------------- 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index ee2136bb5..969f06cae 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -133,10 +133,10 @@ libopenthread_cli_ftd_a_CPPFLAGS = \ SOURCES_COMMON = \ cli.cpp \ + cli_coap.cpp \ cli_console.cpp \ cli_dataset.cpp \ cli_uart.cpp \ - cli_coap.cpp \ cli_udp_example.cpp \ $(NULL) @@ -150,11 +150,11 @@ libopenthread_cli_mtd_a_SOURCES = \ noinst_HEADERS = \ cli.hpp \ + cli_coap.hpp \ cli_console.hpp \ cli_dataset.hpp \ - cli_uart.hpp \ cli_server.hpp \ - cli_coap.hpp \ + cli_uart.hpp \ cli_udp_example.hpp \ $(NULL) diff --git a/src/core/Makefile.am b/src/core/Makefile.am index a710739a8..6a90780ad 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -54,7 +54,7 @@ libopenthread_mtd_a_CPPFLAGS = \ -DOPENTHREAD_MTD=1 \ $(NULL) -#---------------------------------------- +#------------------------------------------------------ # Note to maintainer/developers about "SOURCES_COMMON" # # The traditional method for GNU style Makefile.am files @@ -89,17 +89,18 @@ libopenthread_mtd_a_CPPFLAGS = \ # configurations require appropriate wrappers # Such as #if/#else/#endif # -# The net result is sort of an "empty translation unit" +# The net result is sort of an "empty translation +# unit" # SOURCES_COMMON = \ - api/coap_api.cpp \ - api/commissioner_api.cpp \ + api/border_router_api.cpp \ api/channel_manager_api.cpp \ api/channel_monitor_api.cpp \ api/child_supervision_api.cpp \ + api/coap_api.cpp \ + api/commissioner_api.cpp \ api/crypto_api.cpp \ - api/border_router_api.cpp \ api/dataset_api.cpp \ api/dataset_ftd_api.cpp \ api/dhcp6_api.cpp \ @@ -124,10 +125,10 @@ SOURCES_COMMON = \ coap/coap_secure.cpp \ common/crc16.cpp \ common/instance.cpp \ - common/logging.cpp \ common/locator.cpp \ - common/notifier.cpp \ + common/logging.cpp \ common/message.cpp \ + common/notifier.cpp \ common/settings.cpp \ common/tasklet.cpp \ common/timer.cpp \ @@ -199,8 +200,8 @@ SOURCES_COMMON = \ utils/child_supervision.cpp \ utils/heap.cpp \ utils/jam_detector.cpp \ - utils/missing_strlcpy.c \ utils/missing_strlcat.c \ + utils/missing_strlcpy.c \ utils/missing_strnlen.c \ utils/slaac_address.cpp \ $(NULL) @@ -243,11 +244,11 @@ HEADERS_COMMON = \ common/locator.hpp \ common/logging.hpp \ common/message.hpp \ + common/new.hpp \ common/notifier.hpp \ common/owner-locator.hpp \ common/random.hpp \ common/settings.hpp \ - common/new.hpp \ common/tasklet.hpp \ common/timer.hpp \ common/tlvs.hpp \ @@ -283,8 +284,8 @@ HEADERS_COMMON = \ net/icmp6.hpp \ net/ip6.hpp \ net/ip6_address.hpp \ - net/ip6_headers.hpp \ net/ip6_filter.hpp \ + net/ip6_headers.hpp \ net/ip6_mpl.hpp \ net/ip6_routes.hpp \ net/netif.hpp \ @@ -313,9 +314,9 @@ HEADERS_COMMON = \ thread/network_data_leader_mtd.hpp \ thread/network_data_local.hpp \ thread/network_data_tlvs.hpp \ - thread/panid_query_server.hpp \ thread/network_diagnostic.hpp \ thread/network_diagnostic_tlvs.hpp \ + thread/panid_query_server.hpp \ thread/router_table.hpp \ thread/src_match_controller.hpp \ thread/thread_netif.hpp \ @@ -326,9 +327,9 @@ HEADERS_COMMON = \ utils/channel_manager.hpp \ utils/channel_monitor.hpp \ utils/child_supervision.hpp \ - utils/slaac_address.hpp \ utils/heap.hpp \ utils/jam_detector.hpp \ + utils/slaac_address.hpp \ utils/wrap_stdbool.h \ utils/wrap_stdint.h \ utils/wrap_string.h \ @@ -339,8 +340,8 @@ noinst_HEADERS = \ $(NULL) PRETTY_FILES = \ - $(SOURCES_COMMON) \ $(HEADERS_COMMON) \ + $(SOURCES_COMMON) \ $(NULL) if OPENTHREAD_BUILD_COVERAGE diff --git a/src/ncp/Makefile.am b/src/ncp/Makefile.am index caba7075e..0c3bf38da 100644 --- a/src/ncp/Makefile.am +++ b/src/ncp/Makefile.am @@ -69,26 +69,26 @@ libopenthread_ncp_radio_a_CPPFLAGS = \ COMMON_SOURCES = \ changed_props_set.cpp \ changed_props_set.hpp \ - ncp_base.hpp \ + hdlc.cpp \ + hdlc.hpp \ ncp_base.cpp \ - ncp_base_mtd.cpp \ + ncp_base.hpp \ ncp_base_ftd.cpp \ + ncp_base_mtd.cpp \ ncp_base_radio.cpp \ ncp_buffer.cpp \ ncp_buffer.hpp \ - spinel.c \ - spinel.h \ - spinel_decoder.hpp \ - spinel_decoder.cpp \ - spinel_encoder.hpp \ - spinel_encoder.cpp \ - spinel_platform.h \ ncp_spi.cpp \ ncp_spi.hpp \ - hdlc.cpp \ - hdlc.hpp \ ncp_uart.cpp \ ncp_uart.hpp \ + spinel.c \ + spinel.h \ + spinel_decoder.cpp \ + spinel_decoder.hpp \ + spinel_encoder.cpp \ + spinel_encoder.hpp \ + spinel_platform.h \ $(NULL) if OPENTHREAD_ENABLE_NCP_VENDOR_HOOK diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 43e4a2040..fe6b5e04b 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -33,8 +33,8 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am # since they are not part of the package. # noinst_HEADERS = \ - test_platform.h \ test_lowpan.hpp \ + test_platform.h \ test_util.h \ test_util.hpp \ $(NULL) @@ -88,19 +88,19 @@ check_PROGRAMS = \ test-child-table \ test-heap \ test-hmac-sha256 \ - test-lowpan \ test-link-quality \ - test-network-data \ + test-lowpan \ test-mac-frame \ test-message \ test-message-queue \ + test-network-data \ test-priority-queue \ test-pskc \ + test-spinel-decoder \ + test-spinel-encoder \ test-strlcat \ test-strlcpy \ test-strnlen \ - test-spinel-decoder \ - test-spinel-encoder \ test-timer \ test-toolchain \ $(NULL) @@ -163,9 +163,6 @@ test_link_quality_SOURCES = test_platform.cpp test_link_quality.cpp test_lowpan_LDADD = $(COMMON_LDADD) test_lowpan_SOURCES = test_platform.cpp test_lowpan.cpp test_util.cpp -test_network_data_LDADD = $(COMMON_LDADD) -test_network_data_SOURCES = test_platform.cpp test_network_data.cpp - test_mac_frame_LDADD = $(COMMON_LDADD) test_mac_frame_SOURCES = test_platform.cpp test_mac_frame.cpp @@ -178,6 +175,9 @@ test_message_queue_SOURCES = test_platform.cpp test_message_queue.cpp test_ncp_buffer_LDADD = $(COMMON_LDADD) test_ncp_buffer_SOURCES = test_platform.cpp test_ncp_buffer.cpp +test_network_data_LDADD = $(COMMON_LDADD) +test_network_data_SOURCES = test_platform.cpp test_network_data.cpp + test_priority_queue_LDADD = $(COMMON_LDADD) test_priority_queue_SOURCES = test_platform.cpp test_priority_queue.cpp @@ -217,25 +217,25 @@ PRETTY_FILES = \ $(test_aes_SOURCES) \ $(test_child_SOURCES) \ $(test_child_table_SOURCES) \ + $(test_diag_SOURCES) \ $(test_heap_SOURCES) \ $(test_hmac_sha256_SOURCES) \ $(test_link_quality_SOURCES) \ $(test_lowpan_SOURCES) \ - $(test_network_data_SOURCES) \ $(test_mac_frame_SOURCES) \ - $(test_message_SOURCES) \ $(test_message_queue_SOURCES) \ + $(test_message_SOURCES) \ $(test_ncp_buffer_SOURCES) \ + $(test_network_data_SOURCES) \ $(test_priority_queue_SOURCES) \ $(test_pskc_SOURCES) \ + $(test_spinel_decoder_SOURCES) \ + $(test_spinel_encoder_SOURCES) \ $(test_strlcat_SOURCES) \ $(test_strlcpy_SOURCES) \ $(test_strnlen_SOURCES) \ - $(test_spinel_decoder_SOURCES) \ - $(test_spinel_encoder_SOURCES) \ $(test_timer_SOURCES) \ $(test_toolchain_SOURCES) \ - $(test_diag_SOURCES) \ $(NULL) if OPENTHREAD_BUILD_COVERAGE