[svn-commits] fjoe: freebsd/trunk r9114 - in /freebsd/trunk/freebsd: dahdi-fw-hx8.bin/ dahd...

[SVN commits to the Digium repositories]

Author: fjoe
Date: Sun Aug  8 04:14:59 2010
New Revision: 9114

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9114
Log:
- Fix "make depend" for dahdi_vpmadt032_loader
- Rework fetching firmware tarballs

Modified:
    freebsd/trunk/freebsd/dahdi-fw-hx8.bin/Makefile
    freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile
    freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile
    freebsd/trunk/freebsd/dahdi_vpmadt032_loader/Makefile

Modified: freebsd/trunk/freebsd/dahdi-fw-hx8.bin/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi-fw-hx8.bin/Makefile?view=diff&rev=9114&r1=9113&r2=9114
==============================================================================
--- freebsd/trunk/freebsd/dahdi-fw-hx8.bin/Makefile (original)
+++ freebsd/trunk/freebsd/dahdi-fw-hx8.bin/Makefile Sun Aug  8 04:14:59 2010
@@ -1,13 +1,13 @@
 # $Id$
 
-KMOD=	dahdi-fw-hx8.bin
-FIRMWS=	dahdi-fw-hx8.bin:dahdi-fw-hx8.bin
+KMOD=		dahdi-fw-hx8.bin
+FIRMWS=		dahdi-fw-hx8.bin:dahdi-fw-hx8.bin
+TARBALL=	dahdi-fw-hx8-${HX8_VERSION}.tar.gz
+CLEANFILES=	dahdi-fw-hx8.bin ${TARBALL}
+
+dahdi-fw-hx8.bin:
+	${FETCH} -m ${FIRMWARE_URL}/${TARBALL}
+	${TAR} xvfz ${TARBALL}
 
 .include "../../firmware.mk"
 .include <bsd.kmod.mk>
-
-dahdi-fw-hx8.bin: dahdi-fw-hx8-${HX8_VERSION}.tar.gz
-	${TAR} xvfz ${.ALLSRC}
-
-dahdi-fw-hx8-${HX8_VERSION}.tar.gz:
-	${FETCH} ${FIRMWARE_URL}/${.TARGET}

Modified: freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile?view=diff&rev=9114&r1=9113&r2=9114
==============================================================================
--- freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile (original)
+++ freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile Sun Aug  8 04:14:59 2010
@@ -1,13 +1,13 @@
 # $Id$
 
-KMOD=	dahdi-fw-oct6114-064.bin
-FIRMWS=	dahdi-fw-oct6114-064.bin:dahdi-fw-oct6114-064.bin
+KMOD=		dahdi-fw-oct6114-064.bin
+FIRMWS=		dahdi-fw-oct6114-064.bin:dahdi-fw-oct6114-064.bin
+TARBALL=	dahdi-fw-oct6114-064-${OCT6114_064_VERSION}.tar.gz
+CLEANFILES=	dahdi-fw-oct6114-064.bin ${TARBALL}
+
+dahdi-fw-oct6114-064.bin:
+	${FETCH} -m ${FIRMWARE_URL}/${TARBALL}
+	${TAR} xvfz ${TARBALL}
 
 .include "../../firmware.mk"
 .include <bsd.kmod.mk>
-
-dahdi-fw-oct6114-064.bin: dahdi-fw-oct6114-064-${OCT6114_064_VERSION}.tar.gz
-	${TAR} xvfz ${.ALLSRC}
-
-dahdi-fw-oct6114-064-${OCT6114_064_VERSION}.tar.gz:
-	${FETCH} ${FIRMWARE_URL}/${.TARGET}

Modified: freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile?view=diff&rev=9114&r1=9113&r2=9114
==============================================================================
--- freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile (original)
+++ freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile Sun Aug  8 04:14:59 2010
@@ -1,13 +1,13 @@
 # $Id$
 
-KMOD=	dahdi-fw-oct6114-128.bin
-FIRMWS=	dahdi-fw-oct6114-128.bin:dahdi-fw-oct6114-128.bin
+KMOD=		dahdi-fw-oct6114-128.bin
+FIRMWS=		dahdi-fw-oct6114-128.bin:dahdi-fw-oct6114-128.bin
+TARBALL=	dahdi-fw-oct6114-128-${OCT6114_128_VERSION}.tar.gz
+CLEANFILES=	dahdi-fw-oct6114-128.bin ${TARBALL}
+
+dahdi-fw-oct6114-128.bin:
+	${FETCH} -m ${FIRMWARE_URL}/${TARBALL}
+	${TAR} xvfz ${TARBALL}
 
 .include "../../firmware.mk"
 .include <bsd.kmod.mk>
-
-dahdi-fw-oct6114-128.bin: dahdi-fw-oct6114-128-${OCT6114_128_VERSION}.tar.gz
-	${TAR} xvfz ${.ALLSRC}
-
-dahdi-fw-oct6114-128-${OCT6114_128_VERSION}.tar.gz:
-	${FETCH} ${FIRMWARE_URL}/${.TARGET}

Modified: freebsd/trunk/freebsd/dahdi_vpmadt032_loader/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi_vpmadt032_loader/Makefile?view=diff&rev=9114&r1=9113&r2=9114
==============================================================================
--- freebsd/trunk/freebsd/dahdi_vpmadt032_loader/Makefile (original)
+++ freebsd/trunk/freebsd/dahdi_vpmadt032_loader/Makefile Sun Aug  8 04:14:59 2010
@@ -8,7 +8,8 @@
 SRCS+=		vpmadt032_loader.h
 OBJS=		vpmadt032_${VPMADT032_ARCH}.o
 CFLAGS=		-I${.CURDIR}/../../drivers/dahdi
-CLEANFILES=	vpmadt032_loader.h vpmadt032_${VPMADT032_ARCH}.o dahdi-fwload-vpmadt032-${VPMADT032_VERSION}.tar.gz
+TARBALL=	dahdi-fwload-vpmadt032-${VPMADT032_VERSION}.tar.gz
+CLEANFILES=	vpmadt032_loader.h vpmadt032_${VPMADT032_ARCH}.o ${TARBALL}
 CLEANDIRS=	drivers
 
 .if ${MACHINE_ARCH} == "i386"
@@ -19,19 +20,17 @@
 .error "vpmadt032 is not supported on this architecture (${MACHINE_ARCH})"
 .endif
 
-.include "../../firmware.mk"
-
 vpmadt032_loader.h: ${.OBJDIR}/drivers/dahdi/vpmadt032_loader/vpmadt032_loader.h
 	${CP} ${.ALLSRC} ${.TARGET}
 
 vpmadt032_${VPMADT032_ARCH}.o: ${.OBJDIR}/drivers/dahdi/vpmadt032_loader/vpmadt032_${VPMADT032_ARCH}.o_shipped
 	${CP} ${.ALLSRC:M*.o_shipped} ${.TARGET}
 
-${.OBJDIR}/drivers/dahdi/vpmadt032_loader/vpmadt032_${VPMADT032_ARCH}.o_shipped: dahdi-fwload-vpmadt032-${VPMADT032_VERSION}.tar.gz
-	${TAR} xvfz ${.ALLSRC}
-	${TOUCH} ${.TARGET}
+${.OBJDIR}/drivers/dahdi/vpmadt032_loader/vpmadt032_loader.h: ${.OBJDIR}/drivers/dahdi/vpmadt032_loader/vpmadt032_${VPMADT032_ARCH}.o_shipped
 
-dahdi-fwload-vpmadt032-${VPMADT032_VERSION}.tar.gz:
-	${FETCH} ${FIRMWARE_URL}/${.TARGET}
+${.OBJDIR}/drivers/dahdi/vpmadt032_loader/vpmadt032_${VPMADT032_ARCH}.o_shipped:
+	${FETCH} -m ${FIRMWARE_URL}/${TARBALL}
+	${TAR} xvfz ${TARBALL}
 
+.include "../../firmware.mk"
 .include <bsd.kmod.mk>