lib: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

lib: convert makefiles to Kbuild style
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 9cc1180c37
Showing 7 changed files with 54 additions and 203 deletions Side-by-side Diff
lib/Makefile
lib/libfdt/Makefile
lib/lzma/Makefile
lib/lzo/Makefile
lib/rsa/Makefile
lib/tizen/Makefile
lib/zlib/Makefile
@@ -5,79 +5,59 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)libgeneric.o
-
 ifndef CONFIG_SPL_BUILD
-COBJS-$(CONFIG_AES) += aes.o
-COBJS-$(CONFIG_BZIP2) += bzlib.o
-COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
-COBJS-$(CONFIG_BZIP2) += bzlib_decompress.o
-COBJS-$(CONFIG_BZIP2) += bzlib_randtable.o
-COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
-COBJS-$(CONFIG_USB_TTY) += circbuf.o
-COBJS-y += crc7.o
-COBJS-y += crc16.o
-COBJS-$(CONFIG_OF_CONTROL) += fdtdec.o
-COBJS-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
-COBJS-$(CONFIG_GZIP) += gunzip.o
-COBJS-$(CONFIG_GZIP_COMPRESSED) += gzip.o
-COBJS-y += initcall.o
-COBJS-$(CONFIG_LMB) += lmb.o
-COBJS-y += ldiv.o
-COBJS-$(CONFIG_MD5) += md5.o
-COBJS-y += net_utils.o
-COBJS-$(CONFIG_PHYSMEM) += physmem.o
-COBJS-y += qsort.o
-COBJS-$(CONFIG_SHA1) += sha1.o
-COBJS-$(CONFIG_SHA256) += sha256.o
-COBJS-y	+= strmhz.o
-COBJS-$(CONFIG_TPM) += tpm.o
-COBJS-$(CONFIG_RBTREE)	+= rbtree.o
-COBJS-$(CONFIG_BITREVERSE) += bitrev.o
+obj-$(CONFIG_AES) += aes.o
+obj-$(CONFIG_BZIP2) += bzlib.o
+obj-$(CONFIG_BZIP2) += bzlib_crctable.o
+obj-$(CONFIG_BZIP2) += bzlib_decompress.o
+obj-$(CONFIG_BZIP2) += bzlib_randtable.o
+obj-$(CONFIG_BZIP2) += bzlib_huffman.o
+obj-$(CONFIG_USB_TTY) += circbuf.o
+obj-y += crc7.o
+obj-y += crc16.o
+obj-$(CONFIG_OF_CONTROL) += fdtdec.o
+obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
+obj-$(CONFIG_GZIP) += gunzip.o
+obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o
+obj-y += initcall.o
+obj-$(CONFIG_LMB) += lmb.o
+obj-y += ldiv.o
+obj-$(CONFIG_MD5) += md5.o
+obj-y += net_utils.o
+obj-$(CONFIG_PHYSMEM) += physmem.o
+obj-y += qsort.o
+obj-$(CONFIG_SHA1) += sha1.o
+obj-$(CONFIG_SHA256) += sha256.o
+obj-y	+= strmhz.o
+obj-$(CONFIG_TPM) += tpm.o
+obj-$(CONFIG_RBTREE)	+= rbtree.o
+obj-$(CONFIG_BITREVERSE) += bitrev.o
 endif
  
 ifdef CONFIG_SPL_BUILD
-COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
+obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
+obj-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
 endif
-COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
-COBJS-y += hashtable.o
-COBJS-y += errno.o
-COBJS-y += display_options.o
-COBJS-$(CONFIG_BCH) += bch.o
-COBJS-y += crc32.o
-COBJS-y += ctype.o
-COBJS-y += div64.o
-COBJS-y += hang.o
-COBJS-y += linux_string.o
-COBJS-$(CONFIG_REGEX) += slre.o
-COBJS-y += string.o
-COBJS-y += time.o
-COBJS-$(CONFIG_TRACE) += trace.o
-COBJS-$(CONFIG_BOOTP_PXE) += uuid.o
-COBJS-y += vsprintf.o
-COBJS-$(CONFIG_RANDOM_MACADDR) += rand.o
-COBJS-$(CONFIG_BOOTP_RANDOM_DELAY) += rand.o
-COBJS-$(CONFIG_CMD_LINK_LOCAL) += rand.o
+obj-$(CONFIG_ADDR_MAP) += addr_map.o
+obj-y += hashtable.o
+obj-y += errno.o
+obj-y += display_options.o
+obj-$(CONFIG_BCH) += bch.o
+obj-y += crc32.o
+obj-y += ctype.o
+obj-y += div64.o
+obj-y += hang.o
+obj-y += linux_string.o
+obj-$(CONFIG_REGEX) += slre.o
+obj-y += string.o
+obj-y += time.o
+obj-$(CONFIG_TRACE) += trace.o
+obj-$(CONFIG_BOOTP_PXE) += uuid.o
+obj-y += vsprintf.o
+obj-$(CONFIG_RANDOM_MACADDR) += rand.o
+obj-$(CONFIG_BOOTP_RANDOM_DELAY) += rand.o
+obj-$(CONFIG_CMD_LINK_LOCAL) += rand.o
  
-COBJS	:= $(sort $(COBJS-y))
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
 # SEE README.arm-unaligned-accesses
 $(obj)bzlib.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
@@ -5,31 +5,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)libfdt.o
-
-SOBJS	=
-
 COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o fdt_empty_tree.o
  
-COBJS-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
-COBJS-$(CONFIG_FIT) += $(COBJS-libfdt)
-
-
-COBJS	:= $(sort $(COBJS-y))
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
+obj-$(CONFIG_FIT) += $(COBJS-libfdt)
@@ -8,29 +8,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)liblzma.o
-
-SOBJS	=
-
 CFLAGS += -D_LZMA_PROB32
  
-COBJS-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
-
-COBJS	= $(COBJS-y)
-SRCS 	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
@@ -5,27 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)liblzo.o
-
-SOBJS	=
-
-COBJS-$(CONFIG_LZO) += lzo1x_decompress.o
-
-COBJS	= $(COBJS-y)
-SRCS 	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-$(CONFIG_LZO) += lzo1x_decompress.o
@@ -7,27 +7,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)librsa.o
-
 ifdef CONFIG_FIT_SIGNATURE
-COBJS-$(CONFIG_RSA) += rsa-verify.o
+obj-$(CONFIG_RSA) += rsa-verify.o
 endif
-
-COBJS	:= $(sort $(COBJS-y))
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
@@ -5,27 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)libtizen.o
-
-SOBJS	=
-
-COBJS-$(CONFIG_TIZEN) += tizen.o
-
-COBJS	:= $(sort $(COBJS-y))
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-$(CONFIG_TIZEN) += tizen.o
@@ -5,25 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)libz.o
-
-COBJS-$(CONFIG_ZLIB) += zlib.o
-
-COBJS	:= $(COBJS-y)
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-$(CONFIG_ZLIB) += zlib.o
...	...	@@ -5,79 +5,59 @@
5	5	# SPDX-License-Identifier: GPL-2.0+
6	6	#
7	7
8		-include $(TOPDIR)/config.mk
9		-
10		-LIB = $(obj)libgeneric.o
11		-
12	8	ifndef CONFIG_SPL_BUILD
13		-COBJS-$(CONFIG_AES) += aes.o
14		-COBJS-$(CONFIG_BZIP2) += bzlib.o
15		-COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
16		-COBJS-$(CONFIG_BZIP2) += bzlib_decompress.o
17		-COBJS-$(CONFIG_BZIP2) += bzlib_randtable.o
18		-COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
19		-COBJS-$(CONFIG_USB_TTY) += circbuf.o
20		-COBJS-y += crc7.o
21		-COBJS-y += crc16.o
22		-COBJS-$(CONFIG_OF_CONTROL) += fdtdec.o
23		-COBJS-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
24		-COBJS-$(CONFIG_GZIP) += gunzip.o
25		-COBJS-$(CONFIG_GZIP_COMPRESSED) += gzip.o
26		-COBJS-y += initcall.o
27		-COBJS-$(CONFIG_LMB) += lmb.o
28		-COBJS-y += ldiv.o
29		-COBJS-$(CONFIG_MD5) += md5.o
30		-COBJS-y += net_utils.o
31		-COBJS-$(CONFIG_PHYSMEM) += physmem.o
32		-COBJS-y += qsort.o
33		-COBJS-$(CONFIG_SHA1) += sha1.o
34		-COBJS-$(CONFIG_SHA256) += sha256.o
35		-COBJS-y += strmhz.o
36		-COBJS-$(CONFIG_TPM) += tpm.o
37		-COBJS-$(CONFIG_RBTREE) += rbtree.o
38		-COBJS-$(CONFIG_BITREVERSE) += bitrev.o
	9	+obj-$(CONFIG_AES) += aes.o
	10	+obj-$(CONFIG_BZIP2) += bzlib.o
	11	+obj-$(CONFIG_BZIP2) += bzlib_crctable.o
	12	+obj-$(CONFIG_BZIP2) += bzlib_decompress.o
	13	+obj-$(CONFIG_BZIP2) += bzlib_randtable.o
	14	+obj-$(CONFIG_BZIP2) += bzlib_huffman.o
	15	+obj-$(CONFIG_USB_TTY) += circbuf.o
	16	+obj-y += crc7.o
	17	+obj-y += crc16.o
	18	+obj-$(CONFIG_OF_CONTROL) += fdtdec.o
	19	+obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
	20	+obj-$(CONFIG_GZIP) += gunzip.o
	21	+obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o
	22	+obj-y += initcall.o
	23	+obj-$(CONFIG_LMB) += lmb.o
	24	+obj-y += ldiv.o
	25	+obj-$(CONFIG_MD5) += md5.o
	26	+obj-y += net_utils.o
	27	+obj-$(CONFIG_PHYSMEM) += physmem.o
	28	+obj-y += qsort.o
	29	+obj-$(CONFIG_SHA1) += sha1.o
	30	+obj-$(CONFIG_SHA256) += sha256.o
	31	+obj-y += strmhz.o
	32	+obj-$(CONFIG_TPM) += tpm.o
	33	+obj-$(CONFIG_RBTREE) += rbtree.o
	34	+obj-$(CONFIG_BITREVERSE) += bitrev.o
39	35	endif
40	36
41	37	ifdef CONFIG_SPL_BUILD
42		-COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
43		-COBJS-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
	38	+obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
	39	+obj-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
44	40	endif
45		-COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
46		-COBJS-y += hashtable.o
47		-COBJS-y += errno.o
48		-COBJS-y += display_options.o
49		-COBJS-$(CONFIG_BCH) += bch.o
50		-COBJS-y += crc32.o
51		-COBJS-y += ctype.o
52		-COBJS-y += div64.o
53		-COBJS-y += hang.o
54		-COBJS-y += linux_string.o
55		-COBJS-$(CONFIG_REGEX) += slre.o
56		-COBJS-y += string.o
57		-COBJS-y += time.o
58		-COBJS-$(CONFIG_TRACE) += trace.o
59		-COBJS-$(CONFIG_BOOTP_PXE) += uuid.o
60		-COBJS-y += vsprintf.o
61		-COBJS-$(CONFIG_RANDOM_MACADDR) += rand.o
62		-COBJS-$(CONFIG_BOOTP_RANDOM_DELAY) += rand.o
63		-COBJS-$(CONFIG_CMD_LINK_LOCAL) += rand.o
	41	+obj-$(CONFIG_ADDR_MAP) += addr_map.o
	42	+obj-y += hashtable.o
	43	+obj-y += errno.o
	44	+obj-y += display_options.o
	45	+obj-$(CONFIG_BCH) += bch.o
	46	+obj-y += crc32.o
	47	+obj-y += ctype.o
	48	+obj-y += div64.o
	49	+obj-y += hang.o
	50	+obj-y += linux_string.o
	51	+obj-$(CONFIG_REGEX) += slre.o
	52	+obj-y += string.o
	53	+obj-y += time.o
	54	+obj-$(CONFIG_TRACE) += trace.o
	55	+obj-$(CONFIG_BOOTP_PXE) += uuid.o
	56	+obj-y += vsprintf.o
	57	+obj-$(CONFIG_RANDOM_MACADDR) += rand.o
	58	+obj-$(CONFIG_BOOTP_RANDOM_DELAY) += rand.o
	59	+obj-$(CONFIG_CMD_LINK_LOCAL) += rand.o
64	60
65		-COBJS := $(sort $(COBJS-y))
66		-SRCS := $(COBJS:.o=.c)
67		-OBJS := $(addprefix $(obj),$(COBJS))
68		-
69		-$(LIB): $(obj).depend $(OBJS)
70		- $(call cmd_link_o_target, $(OBJS))
71		-
72	61	# SEE README.arm-unaligned-accesses
73	62	$(obj)bzlib.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
74		-
75		-#########################################################################
76		-
77		-# defines $(obj).depend target
78		-include $(SRCTREE)/rules.mk
79		-
80		-sinclude $(obj).depend
81		-
82		-#########################################################################
...	...	@@ -5,31 +5,8 @@
5	5	# SPDX-License-Identifier: GPL-2.0+
6	6	#
7	7
8		-include $(TOPDIR)/config.mk
9		-
10		-LIB = $(obj)libfdt.o
11		-
12		-SOBJS =
13		-
14	8	COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o fdt_empty_tree.o
15	9
16		-COBJS-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
17		-COBJS-$(CONFIG_FIT) += $(COBJS-libfdt)
18		-
19		-
20		-COBJS := $(sort $(COBJS-y))
21		-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
22		-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
23		-
24		-$(LIB): $(obj).depend $(OBJS)
25		- $(call cmd_link_o_target, $(OBJS))
26		-
27		-#########################################################################
28		-
29		-# defines $(obj).depend target
30		-include $(SRCTREE)/rules.mk
31		-
32		-sinclude $(obj).depend
33		-
34		-#########################################################################
	10	+obj-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
	11	+obj-$(CONFIG_FIT) += $(COBJS-libfdt)
...	...	@@ -8,29 +8,7 @@
8	8	# SPDX-License-Identifier: GPL-2.0+
9	9	#
10	10
11		-include $(TOPDIR)/config.mk
12		-
13		-LIB = $(obj)liblzma.o
14		-
15		-SOBJS =
16		-
17	11	CFLAGS += -D_LZMA_PROB32
18	12
19		-COBJS-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
20		-
21		-COBJS = $(COBJS-y)
22		-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
23		-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
24		-
25		-$(LIB): $(obj).depend $(OBJS)
26		- $(call cmd_link_o_target, $(OBJS))
27		-
28		-#########################################################################
29		-
30		-# defines $(obj).depend target
31		-include $(SRCTREE)/rules.mk
32		-
33		-sinclude $(obj).depend
34		-
35		-#########################################################################
	13	+obj-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
...	...	@@ -5,27 +5,5 @@
5	5	# SPDX-License-Identifier: GPL-2.0+
6	6	#
7	7
8		-include $(TOPDIR)/config.mk
9		-
10		-LIB = $(obj)liblzo.o
11		-
12		-SOBJS =
13		-
14		-COBJS-$(CONFIG_LZO) += lzo1x_decompress.o
15		-
16		-COBJS = $(COBJS-y)
17		-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
18		-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
19		-
20		-$(LIB): $(obj).depend $(OBJS)
21		- $(call cmd_link_o_target, $(OBJS))
22		-
23		-#########################################################################
24		-
25		-# defines $(obj).depend target
26		-include $(SRCTREE)/rules.mk
27		-
28		-sinclude $(obj).depend
29		-
30		-#########################################################################
	8	+obj-$(CONFIG_LZO) += lzo1x_decompress.o
...	...	@@ -7,27 +7,7 @@
7	7	# SPDX-License-Identifier: GPL-2.0+
8	8	#
9	9
10		-include $(TOPDIR)/config.mk
11		-
12		-LIB = $(obj)librsa.o
13		-
14	10	ifdef CONFIG_FIT_SIGNATURE
15		-COBJS-$(CONFIG_RSA) += rsa-verify.o
	11	+obj-$(CONFIG_RSA) += rsa-verify.o
16	12	endif
17		-
18		-COBJS := $(sort $(COBJS-y))
19		-SRCS := $(COBJS:.o=.c)
20		-OBJS := $(addprefix $(obj),$(COBJS))
21		-
22		-$(LIB): $(obj).depend $(OBJS)
23		- $(call cmd_link_o_target, $(OBJS))
24		-
25		-#########################################################################
26		-
27		-# defines $(obj).depend target
28		-include $(SRCTREE)/rules.mk
29		-
30		-sinclude $(obj).depend
31		-
32		-#########################################################################
...	...	@@ -5,25 +5,5 @@
5	5	# SPDX-License-Identifier: GPL-2.0+
6	6	#
7	7
8		-include $(TOPDIR)/config.mk
9		-
10		-LIB = $(obj)libz.o
11		-
12		-COBJS-$(CONFIG_ZLIB) += zlib.o
13		-
14		-COBJS := $(COBJS-y)
15		-SRCS := $(COBJS:.o=.c)
16		-OBJS := $(addprefix $(obj),$(COBJS))
17		-
18		-$(LIB): $(obj).depend $(OBJS)
19		- $(call cmd_link_o_target, $(OBJS))
20		-
21		-#########################################################################
22		-
23		-# defines $(obj).depend target
24		-include $(SRCTREE)/rules.mk
25		-
26		-sinclude $(obj).depend
27		-
28		-#########################################################################
	8	+obj-$(CONFIG_ZLIB) += zlib.o