Gmane
Favicon
From: Pavel Roskin <svn-commits <at> madwifi.org>
Subject: revision 3815 committed
Newsgroups: gmane.linux.drivers.madwifi.cvs
Date: 2008-07-23 21:15:35 GMT (17 weeks, 3 days, 15 hours and 59 minutes ago)
Project     : madwifi
Revision    : 3815
Author      : proski (Pavel Roskin)
Date        : 2008-07-23 23:15:34 +0200 (Wed, 23 Jul 2008)

Log Message :
Split unmangling from uudecoding, don't unmangle in place

Conversions in place should be avoided in the build system because make
doesn't know if the conversion has taken place.  Use a different name
for HAL before unmangling.  Respect the build quietness settings.

Simplify Linux 2.4 rules so that the commands for decoding and
unmangling are written only once.

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

Modified: madwifi/trunk/ath_hal/Makefile
===================================================================
--- madwifi/trunk/ath_hal/Makefile	2008-07-21 17:38:16 UTC (rev 3814)
+++ madwifi/trunk/ath_hal/Makefile	2008-07-23 21:15:34 UTC (rev 3815)
@@ -79,18 +79,26 @@
 quiet_cmd_uudecode = UUDECODE $@
       cmd_uudecode = $(obj)/uudecode -o $@ $<

-$(obj)/$(TARGET).hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode
+$(obj)/$(TARGET)._hal.o: $(HAL)/public/$(TARGET).hal.o.uu $(obj)/uudecode
 ifdef LINUX24
-	$(Q)$(obj)/uudecode -o $@ $<
+	$(cmd_uudecode)
 else
 	$(call if_changed,uudecode)
 endif
+
 # Replace as many hashed names as possible with meaningful
 # ones in the symbol table of the binary kernel module for HAL.
-	$(filter-out -O binary -S,$(OBJCOPY)) \
-		$$(cat $(TOP)/scripts/hal_unmangle.objcopy) \
-		$(obj)/$(TARGET).hal.o
+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
+ifdef LINUX24
+	$(cmd_unmangle)
+else
+	$(call if_changed,unmangle)
+endif
+
 .PHONY: install
 install:
 	test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/