[svn-commits] tzafrir: branch tzafrir/kernelmove_14 r3193 - /team/tzafrir/kernelmove_14/ker...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sat Oct 27 08:33:36 2007
New Revision: 3193

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3193
Log:
Magic applied, and wct4xxp builds once again in this branch.

Modified:
    team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26

Modified: team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26?view=diff&rev=3193&r1=3192&r2=3193
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 (original)
+++ team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 Sat Oct 27 08:33:36 2007
@@ -1,7 +1,9 @@
 obj-m += wct4xxp.o
 
-OCT_CFLAGS	:= $(shell $(src)/../oct612x/octasic-helper cflags  $(src)/../oct612x)
-OCT_OBJS	:= $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
+oct_dir		:= $(src)/../oct612x
+oct_helper	:= $(oct_dir)/octasic-helper
+OCT_CFLAGS	:= $(shell $(oct_helper) cflags  $(oct_dir))
+OCT_OBJS	:= $(shell $(oct_helper) objects ../oct612x)
 
 EXTRA_CFLAGS := -I$(src)/.. $(OCT_CFLAGS) -Wno-undef -DSTANDALONE_ZAPATA 
 FIRM_OBJS	:= $(obj)/../../firmware/zaptel-fw-oct6114-064.o $(obj)/../../firmware/zaptel-fw-oct6114-128.o
@@ -21,4 +23,4 @@
 $(obj)/base.o: $(src)/../zaptel.h
 
 $(obj)/vpm450m.o: $(src)/vpm450m.h
-$(obj)/vpm450m.o: $(src)/../../oct612x/include/oct6100api/oct6100_api.h
+$(obj)/vpm450m.o: $(oct_dir)/include/oct6100api/oct6100_api.h