diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-08-27 02:29:21 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-08-27 02:29:21 +0000 |
commit | cff56510910e47fc43f1ba4a756eb8419aa80774 (patch) | |
tree | 96a83d0fa32953179759d962c1328f1fe3e83a31 /wct4xxp | |
parent | 20619fdb24fc99b7d8995c20dc6d0a91bd24acd5 (diff) |
Merged revisions 1362-1363 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1362 | kpfleming | 2006-08-26 21:20:56 -0500 (Sat, 26 Aug 2006) | 2 lines
it would probably help if we actually linked the Octasic API objects into the wct4xxp module :-)
........
r1363 | kpfleming | 2006-08-26 21:27:23 -0500 (Sat, 26 Aug 2006) | 2 lines
ok... finally, this actually does build correctly for 2.4 kernels
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1364 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
-rw-r--r-- | wct4xxp/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/wct4xxp/Makefile b/wct4xxp/Makefile index 6d992a7..aea3d12 100644 --- a/wct4xxp/Makefile +++ b/wct4xxp/Makefile @@ -4,15 +4,19 @@ include $(obj)/Kbuild else +OCTASIC_OBJS:=$(shell ../oct612x/octasic-helper objects ../oct612x) +OCTASIC_CFLAGS:=$(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef + all: wct4xxp.o -base.o: base.c ../zaptel.h vpm450m.h wct4xxp.h - $(CC) $(KFLAGS) -o $@ -c $< +%.o: %.c + $(CC) $(KFLAGS) $(OCTASIC_CFLAGS) -o $@ -c $< + +base.o: ../zaptel.h vpm450m.h wct4xxp.h -vpm450m.o: vpm450m.c vpm450m.h vpm450m_fw.h ../oct612x/include/oct6100api/oct6100_api.h - $(CC) $(KFLAGS) $(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef -o $@ -c $< +vpm450m.o: vpm450m.h vpm450m_fw.h ../oct612x/include/oct6100api/oct6100_api.h -wct4xxp.o: base.o vpm450m.o +wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) $(LD) -r -o $@ $^ fw2h: CFLAGS= @@ -23,5 +27,6 @@ vpm450m_fw.h: OCT6114-128D.ima fw2h clean: rm -f *.o fw2h rm -f vpm450m_fw.h + rm -f $(OCTASIC_OBJS) endif |