diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | firmware/Makefile | 8 |
2 files changed, 13 insertions, 9 deletions
@@ -62,7 +62,7 @@ ifeq ($(BUILDVER),linux26) UDEVRULES=yes endif ifeq (yes,$(HAS_KSRC)) - HOTPLUG_FIRMWARE:=$(shell if grep -qv '^CONFIG_FW_LOADER=[ym]' $(KCONFIG); then echo "no"; else echo "yes"; fi) + HOTPLUG_FIRMWARE:=$(shell if grep -q '^CONFIG_FW_LOADER=[ym]' $(KCONFIG); then echo "yes"; else echo "no"; fi) endif endif @@ -300,11 +300,15 @@ version.h: tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest -zonedata.lo: zonedata.c - $(CC) -c $(CFLAGS) -o $@ $^ +zonedata.o: tonezone.h -tonezone.lo: tonezone.c - $(CC) -c $(CFLAGS) -o $@ $^ +zonedata.lo: zonedata.c tonezone.h + $(CC) -c $(CFLAGS) -o $@ $< + +tonezone.o: kernel/zaptel.h tonezone.h + +tonezone.lo: tonezone.c tonezone.h kernel/zaptel.h + $(CC) -c $(CFLAGS) -o $@ $< prereq: config.status version.h diff --git a/firmware/Makefile b/firmware/Makefile index 2a834bf..4324c3d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -66,7 +66,7 @@ zaptel-fw-oct6114-064-%.tar.gz: have_download ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; - if test ! -f $@; then exit 1; fi; \ + @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) @echo "Installing zaptel-fw-oct6114-064.bin to hotplug firmware directories" @@ -89,7 +89,7 @@ zaptel-fw-oct6114-128-%.tar.gz: have_download ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; - if test ! -f $@; then exit 1; fi; \ + @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) @echo "Installing zaptel-fw-oct6114-128.bin to hotplug firmware directories" @@ -112,7 +112,7 @@ zaptel-fw-tc400m-%.tar.gz: have_download ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; - if test ! -f $@; then exit 1; fi; \ + @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) @echo "Installing zaptel-fw-tc400m.bin to hotplug firmware directories" @@ -135,7 +135,7 @@ zaptel-fw-vpmadt032-%.tar.gz: have_download ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; - if test ! -f $@; then exit 1; fi; \ + @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) @echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware directories" |