diff --git a/CHANGES b/CHANGES index c621b46..26f6520 100644 --- a/CHANGES +++ b/CHANGES @@ -41,6 +41,7 @@ * Intersil Corporation as part of PRISM(R) chipset product development. * * -------------------------------------------------------------------- + - More makefile work from Pavel Roskin - A major USB patch from Chris Rankin. This rewrites the command-queueing code to something considerably more sane. - A few more Makefile tweaks diff --git a/Makefile b/Makefile index 34d8fd3..5d70182 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,6 @@ mrproper: clean rm -f tags.linux tags TAGS clean: - touch config.mk config.new set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done diff --git a/doc/Makefile b/doc/Makefile index 5326d47..9dfce56 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../config.mk +-include ../config.mk all: @echo "Nothing to do..." diff --git a/etc/Makefile b/etc/Makefile index 5534737..7d46fd2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../config.mk +-include ../config.mk DIRS= pcmcia wlan diff --git a/etc/pcmcia/Makefile b/etc/pcmcia/Makefile index 298eb25..e9f612f 100644 --- a/etc/pcmcia/Makefile +++ b/etc/pcmcia/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk all: @echo "Nothing to do" diff --git a/etc/wlan/Makefile b/etc/wlan/Makefile index 03d22a3..22350e9 100644 --- a/etc/wlan/Makefile +++ b/etc/wlan/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk all: echo "Nothing to do" diff --git a/man/Makefile b/man/Makefile index d6260a6..4b68c73 100644 --- a/man/Makefile +++ b/man/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../config.mk +-include ../config.mk all: @echo "Nothing to do..." diff --git a/src/Makefile b/src/Makefile index 3ec4374..dbc6695 100644 --- a/src/Makefile +++ b/src/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../config.mk +-include ../config.mk DIRS=p80211 prism2 shared wlanctl wland nwepgen \ mkmeta wlancfg diff --git a/src/mkmeta/Makefile b/src/mkmeta/Makefile index 9bfbbb8..c80e2d7 100644 --- a/src/mkmeta/Makefile +++ b/src/mkmeta/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk CPPFLAGS= -I../include -I$(LINUX_SRC)/include \ -D__LINUX_WLAN__ diff --git a/src/nwepgen/Makefile b/src/nwepgen/Makefile index 4462be3..319d516 100644 --- a/src/nwepgen/Makefile +++ b/src/nwepgen/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk CPPFLAGS= -I../include -I$(LINUX_SRC)/include \ -D__LINUX_WLAN__ diff --git a/src/p80211/Makefile b/src/p80211/Makefile index 8408d4d..d6f0e17 100644 --- a/src/p80211/Makefile +++ b/src/p80211/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include $(WLAN_SRC)/../config.mk +-include $(WLAN_SRC)/../config.mk ifeq ($(WLAN_DEBUG), y) WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG diff --git a/src/prism2/Makefile b/src/prism2/Makefile index 276711b..6058514 100644 --- a/src/prism2/Makefile +++ b/src/prism2/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk DIRS=driver ridlist download diff --git a/src/prism2/download/Makefile b/src/prism2/download/Makefile index 2b95a75..e9287f3 100644 --- a/src/prism2/download/Makefile +++ b/src/prism2/download/Makefile @@ -44,7 +44,7 @@ # # -------------------------------------------------------------------- -include ../../../config.mk +-include ../../../config.mk CPPFLAGS= -I../../include -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__ diff --git a/src/prism2/driver/Makefile b/src/prism2/driver/Makefile index bb02e5a..35f801d 100644 --- a/src/prism2/driver/Makefile +++ b/src/prism2/driver/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include $(WLAN_SRC)/../config.mk +-include $(WLAN_SRC)/../config.mk ifeq ($(WLAN_DEBUG), y) WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG diff --git a/src/prism2/ridlist/Makefile b/src/prism2/ridlist/Makefile index b46ee2e..bcbcdd3 100644 --- a/src/prism2/ridlist/Makefile +++ b/src/prism2/ridlist/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../../config.mk +-include ../../../config.mk # Implicit rules to handle the separate obj dirs OBJ_DIR=obj diff --git a/src/shared/Makefile b/src/shared/Makefile index 578d7de..1aebad2 100644 --- a/src/shared/Makefile +++ b/src/shared/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk all: @echo "Nothing to do..." diff --git a/src/wlancfg/Makefile b/src/wlancfg/Makefile index eb9142b..aa3ca4c 100644 --- a/src/wlancfg/Makefile +++ b/src/wlancfg/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk CPPFLAGS= -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__ diff --git a/src/wlanctl/Makefile b/src/wlanctl/Makefile index 18a26b8..189c8a1 100644 --- a/src/wlanctl/Makefile +++ b/src/wlanctl/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk CPPFLAGS= -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__ diff --git a/src/wland/Makefile b/src/wland/Makefile index 32c3176..0d1eae9 100644 --- a/src/wland/Makefile +++ b/src/wland/Makefile @@ -42,7 +42,7 @@ # # -------------------------------------------------------------------- -include ../../config.mk +-include ../../config.mk CPPFLAGS= -I../include -D__LINUX_WLAN__