Hi,

On Mon, Nov 24, 2008 at 3:24 AM, Spen <[EMAIL PROTECTED]> wrote:
> Hi,
>
> I have created a release 1.0 branch:
> svn://svn.berlios.de/svnroot/repos/openocd/branches/openocd_1_0_branch
> if no major issues are found after say 1 month then we will tag a release.
>
> I can test the st/pic32 targets, if anyone has any free time to check other
> targets that would be good.
> Like i said before we will only add major bug fixes to this release branch,
> svn trunk will continue as normal.
>
> Cheers
> Spen
>

I just did a 'make distcheck' on the 1.0 branch and it failed.
Attached is a quick hack of a patch to get it working.

Running distcheck is crucial to perform when rolling a release tarball
from the sources. It probably won't catch all problems, but will catch
most build and install problems.

I suspect that the patch needs to be applied to trunk also, but I have
not checked that.

Ted Roth
Index: src/helper/Makefile.am
===================================================================
--- src/helper/Makefile.am	(revision 1198)
+++ src/helper/Makefile.am	(working copy)
@@ -13,13 +13,14 @@
 	replacements.c fileio.c startup_tcl.c
 
 noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-	time_support.h replacements.h fileio.h jim.h
+	time_support.h replacements.h fileio.h jim.h jim-eventloop.h \
+	startup.tcl bin2char.c
 
-bin2char$(EXEEXT_FOR_BUILD): bin2char.c
+bin2char$(EXEEXT_FOR_BUILD): $(srcdir)/bin2char.c
 	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
 
 # Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
+startup_tcl.c: $(srcdir)/startup.tcl bin2char$(EXEEXT_FOR_BUILD)
 	./bin2char$(EXEEXT_FOR_BUILD) startup_tcl < $(srcdir)/startup.tcl > $@
 
 # add startup_tcl.c to make clean list
Index: src/flash/Makefile.am
===================================================================
--- src/flash/Makefile.am	(revision 1198)
+++ src/flash/Makefile.am	(working copy)
@@ -6,4 +6,5 @@
 					 stellaris.c str9xpec.c stm32x.c tms470.c ecos.c  \
 		     s3c24xx_nand.c s3c2410_nand.c s3c2412_nand.c s3c2440_nand.c s3c2443_nand.c lpc288x.c ocl.c mflash.c
 noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h at91sam7_old.h str7x.h str9x.h nand.h lpc3180_nand_controller.h \
-				 stellaris.h str9xpec.h stm32x.h tms470.h s3c24xx_nand.h s3c24xx_regs_nand.h lpc288x.h mflash.h
+				 stellaris.h str9xpec.h stm32x.h tms470.h s3c24xx_nand.h s3c24xx_regs_nand.h lpc288x.h mflash.h \
+				 ocl.h
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to