From 20bd7616c493e6b73c19d81a276b7083446473c1 Mon Sep 17 00:00:00 2001 From: proski Date: Fri, 1 Aug 2008 02:26:30 +0000 Subject: [PATCH] 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. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3836 0192ed92-7a03-0410-a25b-9323aeb14dbd --- ath_hal/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ath_hal/Makefile b/ath_hal/Makefile index 9314a69..977779d 100644 --- a/ath_hal/Makefile +++ b/ath_hal/Makefile @@ -45,8 +45,11 @@ TOP = $(obj)/.. 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 @@ endif 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 @@ quiet_cmd_unmangle = UNMANGLE $@ 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