From af34522c0b76d554f761989db2cd4748067939b9 Mon Sep 17 00:00:00 2001 From: Randall Meyer Date: Wed, 26 Aug 2020 11:35:04 -0700 Subject: [PATCH] Removes duplicated listing of files in same Makefile target (#7137) (cherry picked from commit ae8c3259b1874ae48954cec6d667be455134caa3) --- configs/body_factory/default/Makefile.am | 2 +- iocore/net/Makefile.am | 6 ++---- iocore/net/quic/Makefile.am | 1 - lib/records/Makefile.am | 1 - mgmt/Makefile.am | 2 -- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configs/body_factory/default/Makefile.am b/configs/body_factory/default/Makefile.am index 953037ccfc8..a24d2e290dc 100644 --- a/configs/body_factory/default/Makefile.am +++ b/configs/body_factory/default/Makefile.am @@ -45,5 +45,5 @@ dist_bodyfactory_DATA = \ timeout\#inactivity \ transcoding\#unsupported \ urlrouting\#no_mapping \ - request\#uri_len_too_long + request\#uri_len_too_long diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am index 6d6f3dc01ae..6af18e982cf 100644 --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@ -86,7 +86,7 @@ test_UDPNet_SOURCES = \ test_I_UDPNet.cc libinknet_a_SOURCES = \ - ALPNSupport.cc \ + ALPNSupport.cc \ BIO_fastopen.cc \ BIO_fastopen.h \ Connection.cc \ @@ -103,7 +103,7 @@ libinknet_a_SOURCES = \ YamlSNIConfig.cc \ Net.cc \ NetVConnection.cc \ - P_ALPNSupport.h \ + P_ALPNSupport.h \ P_SNIActionPerformer.h \ P_CompletionUtil.h \ P_Connection.h \ @@ -122,7 +122,6 @@ libinknet_a_SOURCES = \ P_SSLUtils.h \ P_SSLClientUtils.h \ P_OCSPStapling.h \ - P_Socks.h \ P_UDPConnection.h \ P_UDPIOEvent.h \ P_UDPNet.h \ @@ -153,7 +152,6 @@ libinknet_a_SOURCES = \ SSLSessionTicket.cc \ SSLUtils.cc \ OCSPStapling.cc \ - Socks.cc \ TLSSessionResumptionSupport.cc \ UDPIOEvent.cc \ UnixConnection.cc \ diff --git a/iocore/net/quic/Makefile.am b/iocore/net/quic/Makefile.am index fc02e6d799f..da29c128cf1 100644 --- a/iocore/net/quic/Makefile.am +++ b/iocore/net/quic/Makefile.am @@ -78,7 +78,6 @@ libquic_a_SOURCES = \ QUICPacketProtectionKeyInfo.cc \ QUICTLS.cc \ $(QUICTLS_impl) \ - QUICKeyGenerator.cc \ $(QUICKeyGenerator_impl) \ QUICKeyGenerator.cc \ QUICHKDF.cc \ diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am index e403a81313d..8fc83fb2f95 100644 --- a/lib/records/Makefile.am +++ b/lib/records/Makefile.am @@ -44,7 +44,6 @@ librecords_COMMON = \ P_RecCore.h \ P_RecDefs.h \ P_RecFile.h \ - P_RecFile.h \ P_RecMessage.h \ P_RecUtils.h \ RecConfigParse.cc \ diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index a52678d743b..b5ce714dae9 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -65,8 +65,6 @@ libmgmt_lm_la_SOURCES = \ LocalManager.h \ ConfigManager.cc \ ConfigManager.h \ - DerivativeMetrics.cc \ - DerivativeMetrics.h \ WebMgmtUtils.cc \ WebMgmtUtils.h