patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / wan / Makefile

diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 6bc9ddf..ce6c56b 100644 (file)
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -32,14 +32,6 @@ pc300-objs                   := $(pc300-y)
 
 obj-$(CONFIG_HOSTESS_SV11)     += z85230.o     syncppp.o       hostess_sv11.o
 obj-$(CONFIG_SEALEVEL_4021)    += z85230.o     syncppp.o       sealevel.o
-obj-$(CONFIG_COMX)             +=                              comx.o
-obj-$(CONFIG_COMX_HW_COMX)     +=                              comx-hw-comx.o
-obj-$(CONFIG_COMX_HW_LOCOMX)   += z85230.o     syncppp.o       comx-hw-locomx.o
-obj-$(CONFIG_COMX_HW_MIXCOM)   +=                              comx-hw-mixcom.o
-obj-$(CONFIG_COMX_HW_MUNICH)   +=                              comx-hw-munich.o
-obj-$(CONFIG_COMX_PROTO_PPP)   +=              syncppp.o       comx-proto-ppp.o
-obj-$(CONFIG_COMX_PROTO_LAPB)  +=                              comx-proto-lapb.o
-obj-$(CONFIG_COMX_PROTO_FR)    +=                              comx-proto-fr.o
 obj-$(CONFIG_COSA)             +=              syncppp.o       cosa.o
 obj-$(CONFIG_FARSYNC)          +=              syncppp.o       farsync.o
 obj-$(CONFIG_DSCC4)             +=                             dscc4.o
@@ -69,6 +61,9 @@ obj-$(CONFIG_C101)            += c101.o
 obj-$(CONFIG_WANXL)            += wanxl.o
 obj-$(CONFIG_PCI200SYN)                += pci200syn.o
 
+clean-files := wanxlfw.inc
+$(obj)/wanxl.o:        $(obj)/wanxlfw.inc
+
 ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y)
 ifeq ($(ARCH),m68k)
   AS68K = $(AS)
@@ -80,12 +75,12 @@ endif
 
 quiet_cmd_build_wanxlfw = BLD FW  $@
       cmd_build_wanxlfw = \
-       $(CPP) -Wp,-MD,$(depfile) -Iinclude $(obj)/wanxlfw.S | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \
+       $(CPP) -Wp,-MD,$(depfile) -I$(srctree)/include $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \
        $(LD68K) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \
        hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x  ,//g;1s/^/static u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \
        rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o
 
-$(obj)/wanxlfw.inc:    $(obj)/wanxlfw.S
+$(obj)/wanxlfw.inc:    $(src)/wanxlfw.S
        $(call if_changed_dep,build_wanxlfw)
 targets += wanxlfw.inc
 endif