ft2232: Fix warnings when building against D2XX

[openocd] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c06771204b218920a926ca9312d958a2b6347cf0..1b19ba4360ca4f800b5fb7b7a99e75f3e6b70f6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = gnu 1.6
 
+# make sure we pass the correct jimtcl flags to distcheck
+DISTCHECK_CONFIGURE_FLAGS = --with-jim-ext=nvp --disable-lineedit
+
 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \
@@ -9,11 +12,23 @@ 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 = \
+       BUGS \
+       HACKING \
+       NEWTAPS \
+       PATCHES.txt \
+       README.Win32 \
        Doxyfile.in \
-       tools/logger.pl
+       tools/logger.pl \
+       contrib/loaders
 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
@@ -26,6 +41,7 @@ Doxyfile: $(srcdir)/Doxyfile.in
          echo "### @@@ -= DO NOT EDIT THIS FILE =- @@@ ###" && \
          echo "### @@@ Make changes to Doxyfile.in @@@ ###" && \
          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),' $< \
        ) > $@
@@ -35,9 +51,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 $*)
 
@@ -63,10 +84,10 @@ install-data-hook:
 uninstall-hook:
        rm -rf $(DESTDIR)$(pkgdatadir)/scripts
 
-
 distclean-local:
        rm -rf Doxyfile doxygen
-
+       rm -f $(srcdir)/jimtcl/configure.gnu
+       
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \