[Madwifi-cvs] revision 1686 committed
Status: Beta
Brought to you by:
otaku
Menu
▾
▴
[Madwifi-cvs] revision 1686 committed
|
From: Pavel R. <svn...@ma...> - 2006-07-14 05:16:13
|
Project : madwifi
Revision : 1686
Author : proski (Pavel Roskin)
Date : 2006-07-14 07:15:56 +0200 (Fri, 14 Jul 2006)
Log Message :
Stop using ${...} notation in makefiles
There is no difference between $(...) and ${...} except that the later
is also supported by the shells. Thus, when ${...} is used, it's not
immediately obvious that the expansion should be performed by make. In
fact, some editors highlight $(...) and ${...} differently in makefiles.
Besides, both notations were used next to each other, suggesting that
there is so difference between them.
The ${...} notation is extremely rare in makefiles. Linux uses it
mostly for shell expansion.
Affected Files:
* trunk/BuildCaps.inc updated
* trunk/Makefile updated
* trunk/Makefile.inc updated
* trunk/ath/Makefile updated
* trunk/ath/Makefile.kernel updated
* trunk/ath_rate/amrr/Makefile updated
* trunk/ath_rate/amrr/Makefile.kernel updated
* trunk/ath_rate/onoe/Makefile updated
* trunk/ath_rate/onoe/Makefile.kernel updated
* trunk/ath_rate/sample/Makefile updated
* trunk/ath_rate/sample/Makefile.kernel updated
* trunk/net80211/Makefile updated
* trunk/net80211/Makefile.kernel updated
* trunk/patches/2.4/Makefile updated
* trunk/tools/Makefile updated
Modified: trunk/BuildCaps.inc
===================================================================
--- trunk/BuildCaps.inc 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/BuildCaps.inc 2006-07-14 05:15:56 UTC (rev 1686)
@@ -28,26 +28,26 @@
#
# directives
#
-ifneq ($(strip ${ATH_CAP_SUPERG_FF}),0)
+ifneq ($(strip $(ATH_CAP_SUPERG_FF)),0)
COPTS+= -DATH_SUPERG_FF=1
endif
-ifneq ($(strip ${ATH_CAP_DYNTURBO}),0)
+ifneq ($(strip $(ATH_CAP_DYNTURBO)),0)
COPTS+= -DATH_SUPERG_DYNTURBO=1 -DATH_TURBO_SCAN=1
endif
-ifneq ($(strip ${ATH_CAP_SUPERG_COMP}),0)
+ifneq ($(strip $(ATH_CAP_SUPERG_COMP)),0)
COPTS+= -DATH_SUPERG_COMP=1
endif
-ifneq ($(strip ${ATH_CAP_XR}),0)
+ifneq ($(strip $(ATH_CAP_XR)),0)
COPTS+= -DATH_SUPERG_XR=1
endif
-ifneq ($(strip ${ATH_CAP_TPC}),0)
+ifneq ($(strip $(ATH_CAP_TPC)),0)
COPTS+= -DATH_CAP_TPC=1
endif
-ifneq ($(strip ${ATH_CAP_TX99}),0)
+ifneq ($(strip $(ATH_CAP_TX99)),0)
COPTS+= -DATH_TX99_DIAG=1
endif
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -48,7 +48,7 @@
include $(obj)/Makefile.inc
-DIRS_MODULES = ${ATH} ${ATH_RATE} ${WLAN}
+DIRS_MODULES = $(ATH) $(ATH_RATE) $(WLAN)
obj-y := ath/ $(ATH_RATE)/ net80211/
@@ -56,7 +56,7 @@
modules: configcheck svnversion.h
ifdef LINUX24
- for i in ${DIRS_MODULES}; do \
+ for i in $(DIRS_MODULES); do \
$(MAKE) -C $$i || exit 1; \
done
else
@@ -78,7 +78,7 @@
# conflicts with the 'tools' subdirectory
.PHONY: tools
tools:
- $(MAKE) -C ${TOOLS} all || exit 1
+ $(MAKE) -C $(TOOLS) all || exit 1
install: install-modules install-tools
@@ -87,25 +87,25 @@
@# might cause make to abort the build
sh scripts/find-madwifi-modules.sh $(KERNELRELEASE) $(DESTDIR)
- for i in ${DIRS_MODULES}; do \
+ for i in $(DIRS_MODULES); do \
$(MAKE) -C $$i install || exit 1; \
done
ifeq ($(DESTDIR),)
- (export KMODPATH=${KMODPATH}; /sbin/depmod -ae)
+ (export KMODPATH=$(KMODPATH); /sbin/depmod -ae)
endif
install-tools:
- $(MAKE) -C ${TOOLS} install || exit 1
+ $(MAKE) -C $(TOOLS) install || exit 1
uninstall:
sh scripts/find-madwifi-modules.sh $(KERNELRELEASE) $(DESTDIR)
- $(MAKE) -C ${TOOLS} uninstall
+ $(MAKE) -C $(TOOLS) uninstall
clean:
- for i in ${DIRS_MODULES}; do \
+ for i in $(DIRS_MODULES); do \
$(MAKE) -C $$i clean; \
done
- -$(MAKE) -C ${TOOLS} clean
+ -$(MAKE) -C $(TOOLS) clean
rm -rf .tmp_versions
rm -f Modules.symvers svnversion.h
@@ -166,7 +166,7 @@
exit 1; \
fi
-ifneq ($(strip ${BUS}),AHB)
+ifneq ($(strip $(BUS)),AHB)
@# check PCI support
@if [ -z "$(CONFIG_PCI)" ]; then \
echo "FAILED"; \
Modified: trunk/Makefile.inc
===================================================================
--- trunk/Makefile.inc 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/Makefile.inc 2006-07-14 05:15:56 UTC (rev 1686)
@@ -65,7 +65,7 @@
# TOOLPATH is the path which contains the crosscompile toolchain (?)
-ifeq ($(strip ${BUS}),AHB)
+ifeq ($(strip $(BUS)),AHB)
# Bus type AHB forces the target platform to be mipsisa32.
TARGET := mipsisa32-be-elf
@@ -106,7 +106,7 @@
# KERNELCONF is the name of the file that holds the configuration
# of the target kernel.
-KERNELCONF ?= ${KERNELPATH}/.config
+KERNELCONF ?= $(KERNELPATH)/.config
# sanity check: does KERNELCONF exist?
ifeq ($(wildcard $(KERNELCONF)),)
@@ -115,7 +115,7 @@
# Determine target architecture of the kernel.
ifeq (,$(ARCH_TARGET))
-ARCH_TARGET=$(shell ${DEPTH}/scripts/get_arch_target.sh $(KERNELCONF))
+ARCH_TARGET=$(shell $(DEPTH)/scripts/get_arch_target.sh $(KERNELCONF))
ARCH ?= $(word 1,$(ARCH_TARGET))
TARGET ?= $(word 2,$(ARCH_TARGET))
endif
@@ -130,14 +130,14 @@
# SYSTEMMAP is the name of the System.map file for the target
# kernel. This will be needed when DESTDIR is defined in order
# to run depmod properly.
-SYSTEMMAP ?= ${KERNELPATH}/System.map
+SYSTEMMAP ?= $(KERNELPATH)/System.map
# KMODPATH nominates the directory where the modules will be
# installed to
-ifeq ($(strip ${BUS}),AHB)
-KMODPATH := ${KERNELPATH}/arch/mips/ar531x/RAMDISK/rootdir/lib/modules/${KERNELRELEASE}/net
+ifeq ($(strip $(BUS)),AHB)
+KMODPATH := $(KERNELPATH)/arch/mips/ar531x/RAMDISK/rootdir/lib/modules/$(KERNELRELEASE)/net
else
-KMODPATH := /lib/modules/${KERNELRELEASE}/net
+KMODPATH := /lib/modules/$(KERNELRELEASE)/net
endif
# Recognize 2.4.x kernels to support the old build system
@@ -160,16 +160,16 @@
# Path to the HAL source code.
#
ifeq ($(HAL),)
-HAL= ${obj}/${DEPTH}/hal
+HAL= $(obj)/$(DEPTH)/hal
endif
#
# Path to the 802.11 include files.
#
-WLAN= ${DEPTH}/net80211
+WLAN= $(DEPTH)/net80211
#
# Path to the Atheros device driver.
#
-ATH= ${DEPTH}/ath
+ATH= $(DEPTH)/ath
#
# Path to the rate control algorithm.
#
@@ -179,13 +179,13 @@
#
# Path to the userspace utilities.
#
-TOOLS= ${DEPTH}/tools
+TOOLS= $(DEPTH)/tools
COPTS+= -Werror
-INCS= -include ${obj}/${DEPTH}/include/compat.h -I${obj}/${DEPTH}/include
+INCS= -include $(obj)/$(DEPTH)/include/compat.h -I$(obj)/$(DEPTH)/include
-ifeq ($(strip ${BUS}),AHB)
-INCS+= -isystem ${TOOLPATH}/include
+ifeq ($(strip $(BUS)),AHB)
+INCS+= -isystem $(TOOLPATH)/include
endif
# TARGET defines the target platform architecture. It must match one of
@@ -193,8 +193,8 @@
# host machine architecture. You can override TARGET on the make command
# line or in the environment. See hal/linux/*.inc for the list of
# supported targets.
-ifeq (,$(wildcard ${HAL}/public/${TARGET}.inc))
-TARGETS=$(basename $(notdir $(wildcard ${HAL}/public/*.inc)))
+ifeq (,$(wildcard $(HAL)/public/$(TARGET).inc))
+TARGETS=$(basename $(notdir $(wildcard $(HAL)/public/*.inc)))
$(error TARGET $(TARGET) is invalid, valid targets are: $(TARGETS))
endif
@@ -205,7 +205,7 @@
save_OBJCOPY := $(OBJCOPY)
save_NM := $(NM)
-include ${HAL}/public/${TARGET}.inc
+include $(HAL)/public/$(TARGET).inc
# Restore toolchain valiables
CC := $(save_CC)
@@ -214,7 +214,7 @@
OBJCOPY := $(save_OBJCOPY)
NM := $(save_NM)
-include ${obj}/${DEPTH}/BuildCaps.inc
+include $(obj)/$(DEPTH)/BuildCaps.inc
# Ensure correct endianess
LDFLAGS += $(LDOPTS)
Modified: trunk/ath/Makefile
===================================================================
--- trunk/ath/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -46,7 +46,7 @@
DEPTH= ..
-ifeq ($(strip ${BUS}),AHB)
+ifeq ($(strip $(BUS)),AHB)
BUSNAME=ahb
COPTS+= -DATH_AHB
else
@@ -54,11 +54,11 @@
COPTS+= -DATH_PCI
endif
-include $(obj)/${DEPTH}/Makefile.inc
+include $(obj)/$(DEPTH)/Makefile.inc
-obj-m += ath_${BUSNAME}.o ath_hal.o
-ath_${BUSNAME}-objs := if_ath.o if_ath_${BUSNAME}.o
-ath_hal-objs := ah_osdep.o ${TARGET}.hal.o
+obj-m += ath_$(BUSNAME).o ath_hal.o
+ath_$(BUSNAME)-objs := if_ath.o if_ath_$(BUSNAME).o
+ath_hal-objs := ah_osdep.o $(TARGET).hal.o
hostprogs-y := uudecode
@@ -69,9 +69,9 @@
export-objs := ah_osdep.o
endif
-INCS+= -I${HAL} -I${obj} -I${HAL}/${OS} -I${obj}/${WLAN} -I${obj}/${DEPTH}
+INCS+= -I$(HAL) -I$(obj) -I$(HAL)/$(OS) -I$(obj)/$(WLAN) -I$(obj)/$(DEPTH)
-EXTRA_CFLAGS+= ${INCS} ${COPTS} -DOPT_AH_H=\"${HAL}/public/${TARGET}.opt_ah.h\"
+EXTRA_CFLAGS+= $(INCS) $(COPTS) -DOPT_AH_H=\"$(HAL)/public/$(TARGET).opt_ah.h\"
-include $(TOPDIR)/Rules.make
@@ -86,7 +86,7 @@
quiet_cmd_uudecode = UUDECODE $@
cmd_uudecode = $(obj)/uudecode -o $@ $<
-$(obj)/${TARGET}.hal.o: ${HAL}/public/${TARGET}.hal.o.uu $(obj)/uudecode
+$(obj)/$(TARGET).hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode
ifdef LINUX24
$(Q)$(obj)/uudecode -o $@ $<
else
@@ -94,17 +94,17 @@
endif
install:
- test -d ${DESTDIR}/${KMODPATH} || mkdir -p ${DESTDIR}/${KMODPATH}
- cp ath_${BUSNAME}.${KMODSUF} ${DESTDIR}/${KMODPATH}
- cp ath_hal.${KMODSUF} ${DESTDIR}/${KMODPATH}
+ test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
+ cp ath_$(BUSNAME).$(KMODSUF) $(DESTDIR)/$(KMODPATH)
+ cp ath_hal.$(KMODSUF) $(DESTDIR)/$(KMODPATH)
clean:
rm -f *~ *.o *.ko *.mod.c uudecode .*.cmd
rm -f .depend .version .*.o.flags .*.o.d
rm -rf .tmp_versions
-ath_${BUSNAME}.o: ${ath_${BUSNAME}-objs}
- $(LD) $(LDOPTS) -o ath_${BUSNAME}.$(KMODSUF) -r $(ath_${BUSNAME}-objs)
+ath_$(BUSNAME).o: $(ath_$(BUSNAME)-objs)
+ $(LD) $(LDOPTS) -o ath_$(BUSNAME).$(KMODSUF) -r $(ath_$(BUSNAME)-objs)
-ath_hal.o: ${ath_hal-objs}
+ath_hal.o: $(ath_hal-objs)
$(LD) $(LDOPTS) -o ath_hal.$(KMODSUF) -r $(ath_hal-objs)
Modified: trunk/ath/Makefile.kernel
===================================================================
--- trunk/ath/Makefile.kernel 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath/Makefile.kernel 2006-07-14 05:15:56 UTC (rev 1686)
@@ -32,7 +32,7 @@
endif
# Determine the target (i.e. which HAL to use).
-# The default is ${ARCH}-elf
+# The default is $(ARCH)-elf
TARGET-$(CONFIG_CPU_32v4) = armv4-$(ENDIAN)-elf
TARGET-$(CONFIG_CPU_MIPS32_R1) = mips1-$(ENDIAN)-elf
TARGET-$(CONFIG_CPU_MIPS32_R2) = mips-$(ENDIAN)-elf
@@ -52,7 +52,7 @@
#
# Select bus-specific code. Note that this defaults to PCI.
#
-ifeq ($(strip ${BUS}),AHB)
+ifeq ($(strip $(BUS)),AHB)
BUSNAME=ahb
EXTRA_CFLAGS+= -DATH_AHB
else
@@ -60,34 +60,34 @@
EXTRA_CFLAGS+= -DATH_PCI
endif
-INCS = -include ${COMPAT}/compat.h -I${COMPAT} -I${HAL} -I${HAL}/linux \
- -I${WLAN} -I${src}/.. -I${src}
+INCS = -include $(COMPAT)/compat.h -I$(COMPAT) -I$(HAL) -I$(HAL)/linux \
+ -I$(WLAN) -I$(src)/.. -I$(src)
-EXTRA_CFLAGS += ${INCS} -DOPT_AH_H=\"${HAL}/public/${TARGET}.opt_ah.h\"
+EXTRA_CFLAGS += $(INCS) -DOPT_AH_H=\"$(HAL)/public/$(TARGET).opt_ah.h\"
ifdef LINUX26
-obj-$(CONFIG_ATHEROS) += ath_${BUSNAME}.o ath_hal.o
-ath_${BUSNAME}-objs := if_ath.o if_ath_${BUSNAME}.o
-ath_hal-objs := ah_osdep.o ${TARGET}.hal.o
+obj-$(CONFIG_ATHEROS) += ath_$(BUSNAME).o ath_hal.o
+ath_$(BUSNAME)-objs := if_ath.o if_ath_$(BUSNAME).o
+ath_hal-objs := ah_osdep.o $(TARGET).hal.o
hostprogs-y := uudecode
host-progs := $(hostprogs-y)
endif
ifdef LINUX24
-obj-$(CONFIG_ATHEROS) := if_ath.o if_ath_${BUSNAME}.o
-obj-$(CONFIG_ATHEROS) += ah_osdep.o ${TARGET}.hal.o
+obj-$(CONFIG_ATHEROS) := if_ath.o if_ath_$(BUSNAME).o
+obj-$(CONFIG_ATHEROS) += ah_osdep.o $(TARGET).hal.o
-O_TARGET := ath_${BUSNAME}.o ath_hal.o
+O_TARGET := ath_$(BUSNAME).o ath_hal.o
include $(TOPDIR)/Rules.make
-export-objs := if_ath_${BUSNAME}.o ah_osdep.o
-list-multi := ath_${BUSNAME}.o ath_hal.o
+export-objs := if_ath_$(BUSNAME).o ah_osdep.o
+list-multi := ath_$(BUSNAME).o ath_hal.o
uudecode: uudecode.c
$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
endif
-$(obj)/${TARGET}.hal.o: ${HAL}/public/${TARGET}.hal.o.uu $(obj)/uudecode
+$(obj)/$(TARGET).hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode
$(Q)echo "deps_$@ :=" >$(@D)/.$(@F).cmd
$(Q)$(obj)/uudecode -o $@ $<
Modified: trunk/ath_rate/amrr/Makefile
===================================================================
--- trunk/ath_rate/amrr/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath_rate/amrr/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -49,12 +49,12 @@
obj-m += ath_rate_amrr.o
ath_rate_amrr-objs := amrr.o
-include $(obj)/${DEPTH}/Makefile.inc
+include $(obj)/$(DEPTH)/Makefile.inc
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \
- -I${obj}/${DEPTH}
+INCS+= -I$(HAL) -I$(HAL)/$(OS) -I$(obj)/$(ATH) -I$(obj)/$(WLAN) \
+ -I$(obj)/$(DEPTH)
-EXTRA_CFLAGS+= ${INCS} ${COPTS}
+EXTRA_CFLAGS+= $(INCS) $(COPTS)
-include $(TOPDIR)/Rules.make
@@ -62,13 +62,13 @@
$(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
install:
- test -d ${DESTDIR}/${KMODPATH} || mkdir -p ${DESTDIR}/${KMODPATH}
- cp ath_rate_amrr.${KMODSUF} ${DESTDIR}/${KMODPATH}
+ test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
+ cp ath_rate_amrr.$(KMODSUF) $(DESTDIR)/$(KMODPATH)
clean:
-rm -f *~ *.o *.ko *.mod.c
-rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
-rm -rf .tmp_versions
-ath_rate_amrr.o: ${ath_rate_amrr-objs}
+ath_rate_amrr.o: $(ath_rate_amrr-objs)
$(LD) $(LDOPTS) -o ath_rate_amrr.$(KMODSUF) -r $(ath_rate_amrr-objs)
Modified: trunk/ath_rate/amrr/Makefile.kernel
===================================================================
--- trunk/ath_rate/amrr/Makefile.kernel 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath_rate/amrr/Makefile.kernel 2006-07-14 05:15:56 UTC (rev 1686)
@@ -14,8 +14,8 @@
WLAN= $(srctree)/$(src)/../../net80211
COMPAT= $(srctree)/$(src)/../../include
-INCS= -include ${COMPAT}/compat.h -I${COMPAT}
-EXTRA_CFLAGS+= ${INCS} -I${HAL} -I${HAL}/linux -I${ATH} -I${WLAN} -I${src}/../..
+INCS= -include $(COMPAT)/compat.h -I$(COMPAT)
+EXTRA_CFLAGS+= $(INCS) -I$(HAL) -I$(HAL)/linux -I$(ATH) -I$(WLAN) -I$(src)/../..
ifdef LINUX26
obj-$(CONFIG_ATHEROS) += ath_rate_amrr.o
Modified: trunk/ath_rate/onoe/Makefile
===================================================================
--- trunk/ath_rate/onoe/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath_rate/onoe/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -49,12 +49,12 @@
obj-m += ath_rate_onoe.o
ath_rate_onoe-objs := onoe.o
-include $(obj)/${DEPTH}/Makefile.inc
+include $(obj)/$(DEPTH)/Makefile.inc
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \
- -I${obj}/${DEPTH}
+INCS+= -I$(HAL) -I$(HAL)/$(OS) -I$(obj)/$(ATH) -I$(obj)/$(WLAN) \
+ -I$(obj)/$(DEPTH)
-EXTRA_CFLAGS+= ${INCS} ${COPTS}
+EXTRA_CFLAGS+= $(INCS) $(COPTS)
-include $(TOPDIR)/Rules.make
@@ -62,13 +62,13 @@
$(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
install:
- test -d ${DESTDIR}/${KMODPATH} || mkdir -p ${DESTDIR}/${KMODPATH}
- cp ath_rate_onoe.${KMODSUF} ${DESTDIR}/${KMODPATH}
+ test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
+ cp ath_rate_onoe.$(KMODSUF) $(DESTDIR)/$(KMODPATH)
clean:
-rm -f *~ *.o *.ko *.mod.c
-rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
-rm -rf .tmp_versions
-ath_rate_onoe.o: ${ath_rate_onoe-objs}
+ath_rate_onoe.o: $(ath_rate_onoe-objs)
$(LD) $(LDOPTS) -o ath_rate_onoe.$(KMODSUF) -r $(ath_rate_onoe-objs)
Modified: trunk/ath_rate/onoe/Makefile.kernel
===================================================================
--- trunk/ath_rate/onoe/Makefile.kernel 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath_rate/onoe/Makefile.kernel 2006-07-14 05:15:56 UTC (rev 1686)
@@ -14,8 +14,8 @@
WLAN= $(srctree)/$(src)/../../net80211
COMPAT= $(srctree)/$(src)/../../include
-INCS= -include ${COMPAT}/compat.h -I${COMPAT}
-EXTRA_CFLAGS+= ${INCS} -I${HAL} -I${HAL}/linux -I${ATH} -I${WLAN} -I${src}/../..
+INCS= -include $(COMPAT)/compat.h -I$(COMPAT)
+EXTRA_CFLAGS+= $(INCS) -I$(HAL) -I$(HAL)/linux -I$(ATH) -I$(WLAN) -I$(src)/../..
ifdef LINUX26
obj-$(CONFIG_ATHEROS) += ath_rate_onoe.o
Modified: trunk/ath_rate/sample/Makefile
===================================================================
--- trunk/ath_rate/sample/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath_rate/sample/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -47,12 +47,12 @@
obj-m += ath_rate_sample.o
ath_rate_sample-objs := sample.o
-include $(obj)/${DEPTH}/Makefile.inc
+include $(obj)/$(DEPTH)/Makefile.inc
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \
- -I${obj}/${DEPTH}
+INCS+= -I$(HAL) -I$(HAL)/$(OS) -I$(obj)/$(ATH) -I$(obj)/$(WLAN) \
+ -I$(obj)/$(DEPTH)
-EXTRA_CFLAGS+= ${INCS} ${COPTS}
+EXTRA_CFLAGS+= $(INCS) $(COPTS)
-include $(TOPDIR)/Rules.make
@@ -60,13 +60,13 @@
$(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
install:
- test -d ${DESTDIR}/${KMODPATH} || mkdir -p ${DESTDIR}/${KMODPATH}
- cp ath_rate_sample.${KMODSUF} ${DESTDIR}/${KMODPATH}
+ test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
+ cp ath_rate_sample.$(KMODSUF) $(DESTDIR)/$(KMODPATH)
clean:
-rm -f *~ *.o *.ko *.mod.c
-rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
-rm -rf .tmp_versions
-ath_rate_sample.o: ${ath_rate_sample-objs}
+ath_rate_sample.o: $(ath_rate_sample-objs)
$(LD) $(LDOPTS) -o ath_rate_sample.$(KMODSUF) -r $(ath_rate_sample-objs)
Modified: trunk/ath_rate/sample/Makefile.kernel
===================================================================
--- trunk/ath_rate/sample/Makefile.kernel 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/ath_rate/sample/Makefile.kernel 2006-07-14 05:15:56 UTC (rev 1686)
@@ -14,8 +14,8 @@
WLAN= $(srctree)/$(src)/../../net80211
COMPAT= $(srctree)/$(src)/../../include
-INCS= -include ${COMPAT}/compat.h -I${COMPAT}
-EXTRA_CFLAGS+= ${INCS} -I${HAL} -I${HAL}/linux -I${ATH} -I${WLAN} -I${src}/../..
+INCS= -include $(COMPAT)/compat.h -I$(COMPAT)
+EXTRA_CFLAGS+= $(INCS) -I$(HAL) -I$(HAL)/linux -I$(ATH) -I$(WLAN) -I$(src)/../..
ifdef LINUX26
obj-$(CONFIG_ATHEROS) += ath_rate_sample.o
Modified: trunk/net80211/Makefile
===================================================================
--- trunk/net80211/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/net80211/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -81,11 +81,11 @@
wlan_scan_sta-objs :=ieee80211_scan_sta.o
wlan_scan_ap-objs := ieee80211_scan_ap.o
-include $(obj)/${DEPTH}/Makefile.inc
+include $(obj)/$(DEPTH)/Makefile.inc
-INCS+= -I${HAL} -I${HAL}/${OS} -I$(obj)/${WLAN} -I${obj}/${DEPTH}
+INCS+= -I$(HAL) -I$(HAL)/$(OS) -I$(obj)/$(WLAN) -I$(obj)/$(DEPTH)
-EXTRA_CFLAGS+=$(INCS) ${COPTS}
+EXTRA_CFLAGS+=$(INCS) $(COPTS)
-include $(TOPDIR)/Rules.make
@@ -110,10 +110,10 @@
$(LD) $(LDOPTS) -o wlan_acl.$(KMODSUF) -r $(wlan_acl-objs)
install:
- test -d ${DESTDIR}/${KMODPATH} || mkdir -p ${DESTDIR}/${KMODPATH}
- for i in ${MOD_INSTALL}; do \
+ test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
+ for i in $(MOD_INSTALL); do \
f=`basename $$i .o`; \
- cp $$f.${KMODSUF} ${DESTDIR}/${KMODPATH}; \
+ cp $$f.$(KMODSUF) $(DESTDIR)/$(KMODPATH); \
done
clean:
Modified: trunk/net80211/Makefile.kernel
===================================================================
--- trunk/net80211/Makefile.kernel 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/net80211/Makefile.kernel 2006-07-14 05:15:56 UTC (rev 1686)
@@ -11,8 +11,8 @@
HAL = $(srctree)/$(src)/../hal
-EXTRA_CFLAGS+= -include ${COMPAT}/compat.h -I${COMPAT} -I${src}/.. \
- -I${HAL} -I${HAL}/linux
+EXTRA_CFLAGS+= -include $(COMPAT)/compat.h -I$(COMPAT) -I$(src)/.. \
+ -I$(HAL) -I$(HAL)/linux
#
# There are two authenticator mechanisms: an in-kernel implementation
Modified: trunk/patches/2.4/Makefile
===================================================================
--- trunk/patches/2.4/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/patches/2.4/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -7,7 +7,7 @@
subdir-$(CONFIG_NET80211) += net80211
ifeq ($(CONFIG_ATHEROS),y)
-ifeq ($(strip ${BUS}),AHB)
+ifeq ($(strip $(BUS)),AHB)
obj-y += ath/ath_ahb.o
else
obj-y += ath/ath_pci.o
Modified: trunk/tools/Makefile
===================================================================
--- trunk/tools/Makefile 2006-07-14 04:55:31 UTC (rev 1685)
+++ trunk/tools/Makefile 2006-07-14 05:15:56 UTC (rev 1686)
@@ -31,8 +31,8 @@
# cross-compiling userspace binaries. If not defined, CROSS_COMPILE
# is used.
USER_CROSS_COMPILE ?= $(CROSS_COMPILE)
-STRIP ?= ${USER_CROSS_COMPILE}strip
-CC = ${USER_CROSS_COMPILE}gcc
+STRIP ?= $(USER_CROSS_COMPILE)strip
+CC = $(USER_CROSS_COMPILE)gcc
BINDIR ?= /usr/local/bin
MANDIR ?= /usr/local/man
@@ -41,57 +41,57 @@
# Path to the HAL source code.
#
ifeq ($(HAL),)
-HAL= ${DEPTH}/hal
+HAL= $(DEPTH)/hal
endif
-INCS= -include ${DEPTH}/include/compat.h
+INCS= -include $(DEPTH)/include/compat.h
ALL= athstats 80211stats athkey athchans athctrl \
athdebug 80211debug wlanconfig
-all: ${ALL}
+all: $(ALL)
-INCS+= -I. -I${HAL} -I${DEPTH}
+INCS+= -I. -I$(HAL) -I$(DEPTH)
CFLAGS= -g -O2 -Wall
-ALL_CFLAGS= ${CFLAGS} ${INCS}
+ALL_CFLAGS= $(CFLAGS) $(INCS)
LDFLAGS=
-all: ${ALL}
+all: $(ALL)
athstats: athstats.c
- ${CC} -o athstats ${ALL_CFLAGS} -I../ath ${LDFLAGS} athstats.c
+ $(CC) -o athstats $(ALL_CFLAGS) -I../ath $(LDFLAGS) athstats.c
80211stats: 80211stats.c
- ${CC} -o 80211stats ${ALL_CFLAGS} ${LDFLAGS} 80211stats.c
+ $(CC) -o 80211stats $(ALL_CFLAGS) $(LDFLAGS) 80211stats.c
athkey: athkey.c
- ${CC} -o athkey ${ALL_CFLAGS} ${LDFLAGS} athkey.c
+ $(CC) -o athkey $(ALL_CFLAGS) $(LDFLAGS) athkey.c
athchans: athchans.c
- ${CC} -o athchans ${ALL_CFLAGS} ${LDFLAGS} athchans.c
+ $(CC) -o athchans $(ALL_CFLAGS) $(LDFLAGS) athchans.c
athctrl: athctrl.c
- ${CC} -o athctrl ${ALL_CFLAGS} ${LDFLAGS} athctrl.c
+ $(CC) -o athctrl $(ALL_CFLAGS) $(LDFLAGS) athctrl.c
athdebug: athdebug.c
- ${CC} -o athdebug ${ALL_CFLAGS} ${LDFLAGS} athdebug.c
+ $(CC) -o athdebug $(ALL_CFLAGS) $(LDFLAGS) athdebug.c
wlanconfig: wlanconfig.c
- ${CC} -o wlanconfig ${ALL_CFLAGS} ${LDFLAGS} wlanconfig.c
+ $(CC) -o wlanconfig $(ALL_CFLAGS) $(LDFLAGS) wlanconfig.c
80211debug: 80211debug.c
- ${CC} -o 80211debug ${ALL_CFLAGS} ${LDFLAGS} 80211debug.c
+ $(CC) -o 80211debug $(ALL_CFLAGS) $(LDFLAGS) 80211debug.c
-install: ${ALL}
- install -d ${DESTDIR}${BINDIR}
- for i in ${ALL}; do \
- install $$i ${DESTDIR}${BINDIR}/$$i; \
- ${STRIP} ${DESTDIR}${BINDIR}/$$i; \
+install: $(ALL)
+ install -d $(DESTDIR)$(BINDIR)
+ for i in $(ALL); do \
+ install $$i $(DESTDIR)$(BINDIR)/$$i; \
+ $(STRIP) $(DESTDIR)$(BINDIR)/$$i; \
done
- install -d ${DESTDIR}${MANDIR}/man8
- install -m 0644 man/*.8 ${DESTDIR}${MANDIR}/man8
+ install -d $(DESTDIR)$(MANDIR)/man8
+ install -m 0644 man/*.8 $(DESTDIR)$(MANDIR)/man8
uninstall:
- for i in ${ALL}; do \
- rm -f ${DESTDIR}${BINDIR}/$$i; \
+ for i in $(ALL); do \
+ rm -f $(DESTDIR)$(BINDIR)/$$i; \
done
- for i in ${ALL:=.8}; do \
- rm -f ${DESTDIR}${MANDIR}/man8/$$i; \
+ for i in $(ALL:=.8); do \
+ rm -f $(DESTDIR)$(MANDIR)/man8/$$i; \
done
clean:
- rm -f ${ALL} core a.out
+ rm -f $(ALL) core a.out
|