Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f605005a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

net: liquidio: clean up Makefile for simpler composite object handling 



Now, Kbuild nicely handles composite objects to avoid multiple
definition.

Makefiles can simply add the same objects multiple times across
composite objects.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent dc35da16

drivers/net/ethernet/cavium/liquidio/Makefile

+16 −35
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
#

# Cavium Liquidio ethernet device driver

#

obj-$(CONFIG_LIQUIDIO) += liquidio.o



liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \

common-objs :=	lio_ethtool.o		\

		lio_core.o		\

		request_manager.o	\

		response_manager.o	\
@@ -18,26 +17,8 @@ liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \ 
		octeon_droq.o		\

		octeon_nic.o



liquidio-objs := lio_main.o octeon_console.o lio_vf_rep.o $(liquidio-y)

obj-$(CONFIG_LIQUIDIO) += liquidio.o

liquidio-y := lio_main.o octeon_console.o lio_vf_rep.o $(common-objs)



obj-$(CONFIG_LIQUIDIO_VF) += liquidio_vf.o



ifeq ($(CONFIG_LIQUIDIO)$(CONFIG_LIQUIDIO_VF), yy)

	liquidio_vf-objs := lio_vf_main.o

else

liquidio_vf-$(CONFIG_LIQUIDIO_VF) += lio_ethtool.o \

			lio_core.o         \

			request_manager.o  \

			response_manager.o \

			octeon_device.o    \

			cn66xx_device.o    \

			cn68xx_device.o    \

			cn23xx_pf_device.o \

			cn23xx_vf_device.o \

			octeon_mailbox.o   \

			octeon_mem_ops.o   \

			octeon_droq.o      \

			octeon_nic.o



liquidio_vf-objs := lio_vf_main.o $(liquidio_vf-y)

endif
 
liquidio_vf-y := lio_vf_main.o $(common-objs)