[Madwifi-cvs] revision 3836 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 3836
Author      : proski (Pavel Roskin)
Date        : 2008-08-01 04:26:30 +0200 (Fri, 01 Aug 2008)

Log Message :
Fix Linux 2.4 compatibility, introduce variables for HAL file names

Add targets for both HAL binaries without $(obj), which is needed for
Linux 2.4 build system.  Keep targets with $(obj) for Linux 2.6.

Use $(HALBIN) for non-unmangled HAL and $(HALOBJ) for unmangled HAL.

Affected Files:
* madwifi/trunk/ath_hal/Makefile                      updated             


Modified: madwifi/trunk/ath_hal/Makefile
===================================================================
--- madwifi/trunk/ath_hal/Makefile	2008-07-31 11:34:33 UTC (rev 3835)
+++ madwifi/trunk/ath_hal/Makefile	2008-08-01 02:26:30 UTC (rev 3836)
@@ -45,8 +45,11 @@
 
 include $(TOP)/Makefile.inc
 
+HALBIN := $(TARGET).bin
+HALOBJ := $(TARGET).hal.o
+
 obj-m		+= ath_hal.o
-ath_hal-objs	:= ah_os.o $(TARGET).hal.o
+ath_hal-objs	:= ah_os.o $(HALOBJ)
 
 hostprogs-y	:= uudecode
 
@@ -79,7 +82,7 @@
 quiet_cmd_uudecode = UUDECODE $@
       cmd_uudecode = $(obj)/uudecode -o $@ $<
 
-$(obj)/$(TARGET)._hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode
+$(HALBIN) $(obj)/$(HALBIN): $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode
 ifdef LINUX24
 	$(cmd_uudecode)
 else
@@ -92,7 +95,7 @@
       cmd_unmangle = $(filter-out -O binary -S,$(OBJCOPY)) \
 		$$(cat $(TOP)/scripts/hal_unmangle.objcopy) $< $@
 
-$(obj)/$(TARGET).hal.o: $(obj)/$(TARGET)._hal.o
+$(HALOBJ) $(obj)/$(HALOBJ): $(obj)/$(HALBIN)
 ifdef LINUX24
 	$(cmd_unmangle)
 else