projects
/
madwifi
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed sc_dfs_cac. Replaced it by checking the timer sc_dfs_cac_timer directly
[madwifi/.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 73fb31f7b7c64dc0f3cdae8cfd0c91fd96be92c9..c05032785ef9d4cf7324268f57ac989497af6fa5 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-43,9
+43,7
@@
obj := $(firstword $(obj) $(SUBDIRS) .)
TOP = $(obj)
obj := $(firstword $(obj) $(SUBDIRS) .)
TOP = $(obj)
-ifneq (svnversion.h,$(MAKECMDGOALS))
include $(TOP)/Makefile.inc
include $(TOP)/Makefile.inc
-endif
obj-y := ath/ ath_hal/ ath_rate/ net80211/
obj-y := ath/ ath_hal/ ath_rate/ net80211/
@@
-57,7
+55,7
@@
endif
all: modules tools
.PHONY: modules
all: modules tools
.PHONY: modules
-modules: configcheck svnversion.h
+modules: configcheck
$(TOP)/
svnversion.h
ifdef LINUX24
for i in $(obj-y); do \
$(MAKE) -C $$i || exit 1; \
ifdef LINUX24
for i in $(obj-y); do \
$(MAKE) -C $$i || exit 1; \
@@
-66,9
+64,11
@@
else
$(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
endif
$(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
endif
-.PHONY: svnversion.h
-svnversion.h:
- @if [ -d .svn ]; then \
+$(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
+
+$(TOP)/svnversion.h:
+ @cd $(TOP) && \
+ if [ -d .svn ]; then \
ver=$$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
elif [ -d .git ]; then \
ver=$$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
elif [ -d .git ]; then \
@@
-133,17
+133,12
@@
clean:
done
-$(MAKE) -C $(TOOLS) clean
rm -rf .tmp_versions
done
-$(MAKE) -C $(TOOLS) clean
rm -rf .tmp_versions
- rm -f modules.order *.symvers svnversion.h
+ rm -f modules.order *.symvers
Module.markers
svnversion.h
.PHONY: info
info:
@echo "The following settings will be used for compilation:"
.PHONY: info
info:
@echo "The following settings will be used for compilation:"
- @echo "TARGET : $(TARGET)"
- @echo "ARCH : $(ARCH)"
@echo "BUS : $(BUS)"
@echo "BUS : $(BUS)"
- @if [ -n "$(TOOLPATH)" ]; then \
- @echo "TOOLPATH : $(TOOLPATH)"; \
- fi
@echo "KERNELRELEASE: $(KERNELRELEASE)"
@echo "KERNELPATH : $(KERNELPATH)"
@echo "KERNELCONF : $(KERNELCONF)"
@echo "KERNELRELEASE: $(KERNELRELEASE)"
@echo "KERNELPATH : $(KERNELPATH)"
@echo "KERNELCONF : $(KERNELCONF)"