aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-23 09:04:36 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-04-07 06:04:02 -0400
commit3ca3273eaa509a6a17e33fc7d31714bfd9f65a38 (patch)
treefea30858c9eeca0b8bd768b315841e494c330cfc
parent9ce285cfe3602d71485ac9582ebb8034e485a33c (diff)
kbuild: clean up *-asn1.[ch] patterns from top-level Makefile
Clean up these patterns from the top Makefile to omit 'clean-files' in each Makefile. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--Makefile1
-rw-r--r--crypto/Makefile2
-rw-r--r--crypto/asymmetric_keys/Makefile7
-rw-r--r--net/ipv4/netfilter/Makefile1
4 files changed, 1 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 9de4c2fd0ea0..6f56ebd3c879 100644
--- a/Makefile
+++ b/Makefile
@@ -1616,6 +1616,7 @@ clean: $(clean-dirs)
1616 -o -name '*.su' \ 1616 -o -name '*.su' \
1617 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ 1617 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
1618 -o -name '*.lex.c' -o -name '*.tab.[ch]' \ 1618 -o -name '*.lex.c' -o -name '*.tab.[ch]' \
1619 -o -name '*-asn1.[ch]' \
1619 -o -name '*.symtypes' -o -name 'modules.order' \ 1620 -o -name '*.symtypes' -o -name 'modules.order' \
1620 -o -name modules.builtin -o -name '.tmp_*.o.*' \ 1621 -o -name modules.builtin -o -name '.tmp_*.o.*' \
1621 -o -name .cache.mk \ 1622 -o -name .cache.mk \
diff --git a/crypto/Makefile b/crypto/Makefile
index 4fc69fe94e6a..dd053be693b6 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -38,8 +38,6 @@ obj-$(CONFIG_CRYPTO_DH) += dh_generic.o
38$(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h 38$(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
39$(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h 39$(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
40$(obj)/rsa_helper.o: $(obj)/rsapubkey-asn1.h $(obj)/rsaprivkey-asn1.h 40$(obj)/rsa_helper.o: $(obj)/rsapubkey-asn1.h $(obj)/rsaprivkey-asn1.h
41clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
42clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
43 41
44rsa_generic-y := rsapubkey-asn1.o 42rsa_generic-y := rsapubkey-asn1.o
45rsa_generic-y += rsaprivkey-asn1.o 43rsa_generic-y += rsaprivkey-asn1.o
diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile
index 4719aad5dec0..bd8ed09bfea1 100644
--- a/crypto/asymmetric_keys/Makefile
+++ b/crypto/asymmetric_keys/Makefile
@@ -29,9 +29,6 @@ $(obj)/x509_cert_parser.o: \
29$(obj)/x509-asn1.o: $(obj)/x509-asn1.c $(obj)/x509-asn1.h 29$(obj)/x509-asn1.o: $(obj)/x509-asn1.c $(obj)/x509-asn1.h
30$(obj)/x509_akid-asn1.o: $(obj)/x509_akid-asn1.c $(obj)/x509_akid-asn1.h 30$(obj)/x509_akid-asn1.o: $(obj)/x509_akid-asn1.c $(obj)/x509_akid-asn1.h
31 31
32clean-files += x509-asn1.c x509-asn1.h
33clean-files += x509_akid-asn1.c x509_akid-asn1.h
34
35# 32#
36# PKCS#7 message handling 33# PKCS#7 message handling
37# 34#
@@ -45,8 +42,6 @@ pkcs7_message-y := \
45$(obj)/pkcs7_parser.o: $(obj)/pkcs7-asn1.h 42$(obj)/pkcs7_parser.o: $(obj)/pkcs7-asn1.h
46$(obj)/pkcs7-asn1.o: $(obj)/pkcs7-asn1.c $(obj)/pkcs7-asn1.h 43$(obj)/pkcs7-asn1.o: $(obj)/pkcs7-asn1.c $(obj)/pkcs7-asn1.h
47 44
48clean-files += pkcs7-asn1.c pkcs7-asn1.h
49
50# 45#
51# PKCS#7 parser testing key 46# PKCS#7 parser testing key
52# 47#
@@ -66,5 +61,3 @@ verify_signed_pefile-y := \
66 61
67$(obj)/mscode_parser.o: $(obj)/mscode-asn1.h $(obj)/mscode-asn1.h 62$(obj)/mscode_parser.o: $(obj)/mscode-asn1.h $(obj)/mscode-asn1.h
68$(obj)/mscode-asn1.o: $(obj)/mscode-asn1.c $(obj)/mscode-asn1.h 63$(obj)/mscode-asn1.o: $(obj)/mscode-asn1.c $(obj)/mscode-asn1.h
69
70clean-files += mscode-asn1.c mscode-asn1.h
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 7523ddb2566b..6364449a4f86 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
31nf_nat_snmp_basic-y := nf_nat_snmp_basic-asn1.o nf_nat_snmp_basic_main.o 31nf_nat_snmp_basic-y := nf_nat_snmp_basic-asn1.o nf_nat_snmp_basic_main.o
32$(obj)/nf_nat_snmp_basic_main.o: $(obj)/nf_nat_snmp_basic-asn1.h 32$(obj)/nf_nat_snmp_basic_main.o: $(obj)/nf_nat_snmp_basic-asn1.h
33obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o 33obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
34clean-files := nf_nat_snmp_basic-asn1.c nf_nat_snmp_basic-asn1.h
35 34
36obj-$(CONFIG_NF_NAT_MASQUERADE_IPV4) += nf_nat_masquerade_ipv4.o 35obj-$(CONFIG_NF_NAT_MASQUERADE_IPV4) += nf_nat_masquerade_ipv4.o
37 36