X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2FMakefile;h=c3bc02be299a8bc4da96d62ac8547d2dbe86aa21;hb=HEAD;hp=5d7008947169044e5b1cecbd36bbb0095e824498;hpb=eaac5479fd8f65687ac2ef8d381afe13f5dc85f6;p=madwifi%2F.git

diff --git a/tools/Makefile b/tools/Makefile
index 5d70089..c3bc02b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -37,32 +37,23 @@ CC = $(USER_CROSS_COMPILE)gcc
 BINDIR ?= /usr/local/bin
 MANDIR ?= /usr/local/man
 
-ATH_HAL = $(TOP)/ath_hal
-
 #
 # Path to the HAL source code.
 #
 ifeq ($(HAL),)
-HAL = $(TOP)/hal
+HAL = $(TOP)/ath_hal
 endif
 
 
 PROGRAMS = athstats 80211stats athkey athchans athctrl \
 	athdebug 80211debug wlanconfig wpakey
 
-SUBDIRS = ath_info
-
-INCS = -I. -I$(HAL) -I$(TOP) -I$(ATH_HAL)
+INCS = -I. -I$(HAL) -I$(TOP)
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(INCS)
 LDFLAGS =
 
-all: all-subdirs $(PROGRAMS)
-
-all-subdirs:
-	for d in $(SUBDIRS); do \
-		$(MAKE) -C $$d || exit 1; \
-	done
+all: $(PROGRAMS)
 
 athstats: athstats.c
 	$(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c
@@ -92,9 +83,6 @@ install: all
 	install -d $(DESTDIR)$(MANDIR)/man8
 	install -m 0644 man/*.8 $(DESTDIR)$(MANDIR)/man8
 	install $(TOP)/scripts/madwifi-unload $(DESTDIR)$(BINDIR)/madwifi-unload
-	for d in $(SUBDIRS); do \
-		$(MAKE) -C $$d install || exit 1; \
-	done
 
 uninstall:
 	for i in $(PROGRAMS); do \
@@ -103,14 +91,8 @@ uninstall:
 	for i in $(PROGRAMS:=.8); do \
 		rm -f $(DESTDIR)$(MANDIR)/man8/$$i; \
 	done
-	for d in $(SUBDIRS); do \
-		$(MAKE) -C $$d uninstall || exit 1; \
-	done
 
 clean:
 	rm -f $(PROGRAMS) core a.out
-	for d in $(SUBDIRS); do \
-		$(MAKE) -C $$d clean; \
-	done
 
-.PHONY: all all-subdirs clean install uninstall
+.PHONY: all clean install uninstall