From 4b53eb75870fbabc67b80e5935bbbc06a4688e57 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 21 May 2015 14:29:47 -0700 Subject: [PATCH] Cleanup makefile --- Makefile | 145 +++++++++++++++++++++++++++---------------------------- 1 file changed, 72 insertions(+), 73 deletions(-) diff --git a/Makefile b/Makefile index 18dec27..5f27a56 100644 --- a/Makefile +++ b/Makefile @@ -174,19 +174,19 @@ ifeq ($(CONFIG_MP_INCLUDED), y) _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_mp.o endif -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/odm_RTL8192C.o\ - hal/OUTSRC/$(RTL871X)/HalDMOutSrc8192C_CE.o +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/odm_RTL8192C.o \ + hal/OUTSRC/$(RTL871X)/HalDMOutSrc8192C_CE.o ifeq ($(CONFIG_USB_HCI), y) -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8192CUFWImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192CUPHYImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192CUMACImg_CE.o +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8192CUFWImg_CE.o \ + hal/OUTSRC/$(RTL871X)/Hal8192CUPHYImg_CE.o \ + hal/OUTSRC/$(RTL871X)/Hal8192CUMACImg_CE.o endif ifeq ($(CONFIG_PCI_HCI), y) -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8192CEFWImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192CEPHYImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192CEMACImg_CE.o +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8192CEFWImg_CE.o \ + hal/OUTSRC/$(RTL871X)/Hal8192CEPHYImg_CE.o \ + hal/OUTSRC/$(RTL871X)/Hal8192CEMACImg_CE.o endif endif @@ -222,19 +222,19 @@ ifeq ($(CONFIG_MP_INCLUDED), y) _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_mp.o endif -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/odm_RTL8192D.o\ - hal/OUTSRC/$(RTL871X)/HalDMOutSrc8192D_CE.o +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/odm_RTL8192D.o \ + hal/OUTSRC/$(RTL871X)/HalDMOutSrc8192D_CE.o ifeq ($(CONFIG_USB_HCI), y) _OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8192DUFWImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192DUPHYImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192DUMACImg_CE.o + hal/OUTSRC/$(RTL871X)/Hal8192DUPHYImg_CE.o \ + hal/OUTSRC/$(RTL871X)/Hal8192DUMACImg_CE.o endif ifeq ($(CONFIG_PCI_HCI), y) _OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8192DEFWImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192DEPHYImg_CE.o \ - hal/OUTSRC/$(RTL871X)/Hal8192DEMACImg_CE.o + hal/OUTSRC/$(RTL871X)/Hal8192DEPHYImg_CE.o \ + hal/OUTSRC/$(RTL871X)/Hal8192DEMACImg_CE.o endif endif @@ -258,9 +258,9 @@ endif EXTRA_CFLAGS += -DCONFIG_RTL8723A _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723PwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o \ - hal/$(RTL871X)/$(RTL871X)_sreset.o + hal/$(RTL871X)/Hal8723PwrSeq.o \ + hal/$(RTL871X)/$(RTL871X)_xmit.o \ + hal/$(RTL871X)/$(RTL871X)_sreset.o _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(RTL871X)_phycfg.o \ @@ -308,10 +308,10 @@ _OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8723EHWImg_CE.o endif #hal/OUTSRC/$(RTL871X)/HalHWImg8723A_FW.o -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8723A_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723A_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723A_RF.o\ - hal/OUTSRC/$(RTL871X)/odm_RegConfig8723A.o +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8723A_BB.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8723A_MAC.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8723A_RF.o \ + hal/OUTSRC/$(RTL871X)/odm_RegConfig8723A.o _OUTSRC_FILES += hal/OUTSRC/rtl8192c/HalDMOutSrc8192C_CE.o @@ -337,9 +337,9 @@ endif EXTRA_CFLAGS += -DCONFIG_RTL8188E _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188EPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o + hal/$(RTL871X)/Hal8188EPwrSeq.o \ + hal/$(RTL871X)/$(RTL871X)_xmit.o \ + hal/$(RTL871X)/$(RTL871X)_sreset.o _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(RTL871X)_phycfg.o \ @@ -367,13 +367,13 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_mp.o endif #hal/OUTSRC/$(RTL871X)/Hal8188EFWImg_CE.o -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8188E_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8188E_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8188E_RF.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8188E_FW.o\ - hal/OUTSRC/$(RTL871X)/HalPhyRf_8188e.o\ - hal/OUTSRC/$(RTL871X)/odm_RegConfig8188E.o\ - hal/OUTSRC/$(RTL871X)/Hal8188ERateAdaptive.o\ +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8188E_MAC.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8188E_BB.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8188E_RF.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8188E_FW.o \ + hal/OUTSRC/$(RTL871X)/HalPhyRf_8188e.o \ + hal/OUTSRC/$(RTL871X)/odm_RegConfig8188E.o \ + hal/OUTSRC/$(RTL871X)/Hal8188ERateAdaptive.o \ hal/OUTSRC/$(RTL871X)/odm_RTL8188E.o endif @@ -395,9 +395,9 @@ MODULE_NAME = 8192ee endif EXTRA_CFLAGS += -DCONFIG_RTL8192E _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8192EPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o + hal/$(RTL871X)/Hal8192EPwrSeq.o \ + hal/$(RTL871X)/$(RTL871X)_xmit.o \ + hal/$(RTL871X)/$(RTL871X)_sreset.o _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(RTL871X)_phycfg.o \ @@ -425,12 +425,12 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_mp.o endif #hal/OUTSRC/$(RTL871X)/HalHWImg8188E_FW.o -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8192E_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8192E_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8192E_RF.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8192E_FW.o\ - hal/OUTSRC/$(RTL871X)/HalPhyRf_8192e.o\ - hal/OUTSRC/$(RTL871X)/odm_RegConfig8192E.o\ +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8192E_MAC.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8192E_BB.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8192E_RF.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8192E_FW.o \ + hal/OUTSRC/$(RTL871X)/HalPhyRf_8192e.o \ + hal/OUTSRC/$(RTL871X)/odm_RegConfig8192E.o \ hal/OUTSRC/$(RTL871X)/odm_RTL8192E.o endif @@ -452,8 +452,8 @@ endif _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ hal/$(RTL871X)/Hal8812PwrSeq.o \ - hal/$(RTL871X)/Hal8821APwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ + hal/$(RTL871X)/Hal8821APwrSeq.o \ + hal/$(RTL871X)/$(RTL871X)_xmit.o \ hal/$(RTL871X)/$(RTL871X)_sreset.o _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ @@ -483,15 +483,15 @@ endif ifeq ($(CONFIG_RTL8812A), y) EXTRA_CFLAGS += -DCONFIG_RTL8812A -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8812A_FW.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_RF.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_FW.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_RF.o\ - hal/OUTSRC/$(RTL871X)/HalPhyRf_8812A.o\ +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8812A_FW.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_MAC.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_BB.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_RF.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_FW.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_MAC.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_BB.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8812A_TestChip_RF.o \ + hal/OUTSRC/$(RTL871X)/HalPhyRf_8812A.o \ hal/OUTSRC/$(RTL871X)/odm_RegConfig8812A.o endif @@ -511,15 +511,15 @@ MODULE_NAME := 8821as endif EXTRA_CFLAGS += -DCONFIG_RTL8821A -_OUTSRC_FILES += hal/OUTSRC/rtl8821a/HalHWImg8821A_FW.o\ - hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.o\ - hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.o\ - hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.o\ - hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_MAC.o\ - hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_BB.o\ - hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_RF.o\ - hal/OUTSRC/rtl8812a/HalPhyRf_8812A.o\ - hal/OUTSRC/rtl8821a/HalPhyRf_8821A.o\ +_OUTSRC_FILES += hal/OUTSRC/rtl8821a/HalHWImg8821A_FW.o \ + hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.o \ + hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.o \ + hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.o \ + hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_MAC.o \ + hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_BB.o \ + hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_RF.o \ + hal/OUTSRC/rtl8812a/HalPhyRf_8812A.o \ + hal/OUTSRC/rtl8821a/HalPhyRf_8821A.o \ hal/OUTSRC/rtl8821a/odm_RegConfig8821A.o endif @@ -534,8 +534,8 @@ MODULE_NAME = 8723bs EXTRA_CFLAGS += -DCONFIG_RTL8723B _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723BPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o + hal/$(RTL871X)/Hal8723BPwrSeq.o \ + hal/$(RTL871X)/$(RTL871X)_sreset.o _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(RTL871X)_phycfg.o \ @@ -557,15 +557,14 @@ ifeq ($(CONFIG_BT_COEXIST), y) _HAL_INTFS_FILES += hal/$(RTL871X)/rtl8723b_bt-coexist.o endif -_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8723B_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723B_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723B_RF.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723B_FW.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723B_MP.o\ - hal/OUTSRC/$(RTL871X)/odm_RegConfig8723B.o\ - hal/OUTSRC/$(RTL871X)/HalPhyRf_8723B.o\ - hal/OUTSRC/$(RTL871X)/odm_RTL8723B.o - +_OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8723B_BB.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8723B_MAC.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8723B_RF.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8723B_FW.o \ + hal/OUTSRC/$(RTL871X)/HalHWImg8723B_MP.o \ + hal/OUTSRC/$(RTL871X)/odm_RegConfig8723B.o \ + hal/OUTSRC/$(RTL871X)/HalPhyRf_8723B.o \ + hal/OUTSRC/$(RTL871X)/odm_RTL8723B.o endif ########### AUTO_CFG ################################# @@ -1073,11 +1072,11 @@ clean: endif check: - vagrant up || vagrant init ubuntu/vivid32; vagrant up # need gcc-4.9 to avoid error `cc1: error: -Werror=date-time: no option -Wdate-time` (trusty only has gcc-4.9-base which doesn't provide /usr/bin/gcc-4.9) + vagrant up || vagrant init ubuntu/vivid32; vagrant up TMP=$$(vagrant ssh-config | grep Port | cut -d ' ' -f 4);\ ssh -p $$TMP -i $(HOME)/.vagrant.d/insecure_private_key vagrant@localhost 'bash -s' < fetch.sh vagrant ssh -c 'sudo dpkg -i linux-headers-4.0.1-040001_4.0.1-040001.201504290935_all.deb linux-headers-4.0.1-040001-generic_4.0.1-040001.201504290935_i386.deb linux-image-4.0.1-040001-generic_4.0.1-040001.201504290935_i386.deb' - vagrant ssh -c 'sudo apt-get update && sudo apt-get install --yes git make' + vagrant ssh -c 'sudo apt-get update && sudo apt-get install --yes git build-essential' vagrant ssh -c 'if ! [ -d rtl8812AU_8821AU_linux ] ; then git clone https://github.com/abperiasamy/rtl8812AU_8821AU_linux.git; fi' vagrant ssh -c 'cd rtl8812AU_8821AU_linux; make KVER=4.0.1-040001-generic' vagrant ssh -c 'cd rtl8812AU_8821AU_linux; sudo make install'