[zaptel-commits] kpfleming: branch 1.4 r4062 - in /branches/1.4: Makefile firmware/Makefile

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Mar 21 18:30:07 2008
New Revision: 4062

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4062
Log:
minor fixes... some missing dependencies and extraneous output when downloading firmware

Modified:
    branches/1.4/Makefile
    branches/1.4/firmware/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=4062&r1=4061&r2=4062
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Fri Mar 21 18:30:07 2008
@@ -62,7 +62,7 @@
     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 @@
 
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
-zonedata.lo: zonedata.c
-	$(CC) -c $(CFLAGS) -o $@ $^
-
-tonezone.lo: tonezone.c
-	$(CC) -c $(CFLAGS) -o $@ $^
+zonedata.o: tonezone.h
+
+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
 

Modified: branches/1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=4062&r1=4061&r2=4062
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Fri Mar 21 18:30:07 2008
@@ -66,7 +66,7 @@
 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 @@
 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 @@
 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 @@
 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"