NAND/TCL: fix segfault on syntax error

[openocd] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index be42c2832a5be83ef8891b2af097d4b6773620f9..b31bcea9195be838ac5fe08c30afd082df69fdb8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,13 @@ nobase_dist_pkgdata_DATA = \
        contrib/libdcc/README \
        contrib/openocd.udev
 
-SUBDIRS = src doc
+if INTERNAL_JIMTCL
+SUBDIRS = jimtcl
+else
+SUBDIRS =
+endif
+
+SUBDIRS += src doc
 
 EXTRA_DIST = \
        Doxyfile.in \
@@ -25,7 +31,10 @@ Doxyfile: $(srcdir)/Doxyfile.in
        @( \
          echo "### @@@ -= DO NOT EDIT THIS FILE =- @@@ ###" && \
          echo "### @@@ Make changes to Doxyfile.in @@@ ###" && \
-         sed -e 's,@srcdir\@,$(srcdir),' $< \
+         sed -e 's,@srcdir\@,$(srcdir),' \
+           -e 's,@builddir\@,$(builddir),' \
+           -e 's,@doxygen_as_html\@,$(doxygen_as_html),' \
+           -e 's,@doxygen_as_pdf\@,$(doxygen_as_pdf),' $< \
        ) > $@
 
 THE_MANUAL = doxygen/latex/refman.pdf
@@ -33,9 +42,14 @@ THE_MANUAL = doxygen/latex/refman.pdf
 doxygen::
        $(MAKE) Doxyfile
        doxygen Doxyfile 2>&1 | perl $(srcdir)/tools/logger.pl > doxygen.log
-       $(MAKE) $(THE_MANUAL)
-
-%.pdf: %.tex
+       @if [ -f doxygen/latex/refman.tex ]; then \
+               echo "Creating $(THE_MANUAL)..."; \
+               $(MAKE) $(THE_MANUAL); \
+       else \
+               echo "Skipping Doxygen PDF..."; \
+       fi
+
+$(THE_MANUAL): %.pdf: %.tex
        -cd $$(dirname $*) && pdflatex $$(basename $*)
        -cd $$(dirname $*) && pdflatex $$(basename $*)