diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-19 20:26:10 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-26 02:01:27 +0900 |
| commit | f605005a50fc1443a14b4e8c9c1727881f8f96ae (patch) | |
| tree | 8e86c221643d4cc1cf5760934c4d3ea0769cdc23 /drivers/net | |
| parent | dc35da16a2e23db04822f0129cd5b28b7b0e72b4 (diff) | |
| download | linux-f605005a50fc1443a14b4e8c9c1727881f8f96ae.tar.gz linux-f605005a50fc1443a14b4e8c9c1727881f8f96ae.tar.bz2 linux-f605005a50fc1443a14b4e8c9c1727881f8f96ae.zip | |
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/Makefile | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/Makefile b/drivers/net/ethernet/cavium/liquidio/Makefile index e3fc4645cd8a..bc9937502043 100644 --- a/drivers/net/ethernet/cavium/liquidio/Makefile +++ b/drivers/net/ethernet/cavium/liquidio/Makefile @@ -2,42 +2,23 @@ # # Cavium Liquidio ethernet device driver # -obj-$(CONFIG_LIQUIDIO) += liquidio.o -liquidio-$(CONFIG_LIQUIDIO) += 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 +common-objs := 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-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) |