X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2FMakefile;h=c3bc02be299a8bc4da96d62ac8547d2dbe86aa21;hb=8b13bec8b1dfc1940ddbf7c456587b6b252bcc4a;hp=709d64b7387fa487e4f8e3aef99a8ef9451fdd49;hpb=b9553d96cbe122b5194e147719d063a059e124e9;p=madwifi%2F.git

diff --git a/tools/Makefile b/tools/Makefile
index 709d64b..c3bc02b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -37,27 +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
 
 
-ALL=	athstats 80211stats athkey athchans athctrl \
-	athdebug 80211debug wlanconfig
-
-all:	$(ALL)
+PROGRAMS = athstats 80211stats athkey athchans athctrl \
+	athdebug 80211debug wlanconfig wpakey
 
-INCS=	-I. -I$(HAL) -I$(TOP) -I$(ATH_HAL)
-CFLAGS=	-g -O2 -Wall
-ALL_CFLAGS= $(CFLAGS) $(INCS)
-LDFLAGS=
+INCS = -I. -I$(HAL) -I$(TOP)
+CFLAGS = -g -O2 -Wall
+ALL_CFLAGS = $(CFLAGS) $(INCS)
+LDFLAGS =
 
-all:	$(ALL)
+all: $(PROGRAMS)
 
 athstats: athstats.c
 	$(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c
@@ -75,11 +71,12 @@ wlanconfig: wlanconfig.c
 	$(CC) -o wlanconfig $(ALL_CFLAGS) $(LDFLAGS) wlanconfig.c
 80211debug: 80211debug.c
 	$(CC) -o 80211debug $(ALL_CFLAGS) $(LDFLAGS) 80211debug.c
+wpakey: wpakey.c
+	$(CC) -o wpakey $(ALL_CFLAGS) $(LDFLAGS) wpakey.c
 
-
-install: $(ALL) 
+install: all
 	install -d $(DESTDIR)$(BINDIR)
-	for i in $(ALL); do \
+	for i in $(PROGRAMS); do \
 		install $$i $(DESTDIR)$(BINDIR)/$$i; \
 		$(STRIP) $(DESTDIR)$(BINDIR)/$$i; \
 	done
@@ -88,12 +85,14 @@ install: $(ALL)
 	install $(TOP)/scripts/madwifi-unload $(DESTDIR)$(BINDIR)/madwifi-unload
 
 uninstall:
-	for i in $(ALL); do \
+	for i in $(PROGRAMS); do \
 		rm -f $(DESTDIR)$(BINDIR)/$$i; \
 	done
-	for i in $(ALL:=.8); do \
+	for i in $(PROGRAMS:=.8); do \
 		rm -f $(DESTDIR)$(MANDIR)/man8/$$i; \
 	done
 
 clean:
-	rm -f $(ALL) core a.out
+	rm -f $(PROGRAMS) core a.out
+
+.PHONY: all clean install uninstall