semihosting: fix return value of SYS_READ and SYS_WRITE

[openocd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4e6c285078a2708261d560098c4bd2e4da536371..a18c572fbf002e8f86d8672d2c3693b5e65d4dc3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,33 +2,68 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = gnu 1.6
 
+.DELETE_ON_ERROR:
+
 # make sure we pass the correct jimtcl flags to distcheck
 DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
+# do not run Jim Tcl tests (esp. during distcheck)
+check-recursive: SUBDIRS :=
+
 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \
        contrib/libdcc/example.c \
        contrib/libdcc/README \
-       contrib/openocd.udev
+       contrib/60-openocd.rules
 
-if INTERNAL_JIMTCL
-SUBDIRS = jimtcl
-else
 SUBDIRS =
+DIST_SUBDIRS =
+bin_PROGRAMS =
+noinst_LTLIBRARIES =
+info_TEXINFOS =
+dist_man_MANS =
+EXTRA_DIST =
+
+if INTERNAL_JIMTCL
+SUBDIRS += jimtcl
+DIST_SUBDIRS += jimtcl
 endif
 
-SUBDIRS += src doc
+# common flags used in openocd build
+AM_CFLAGS = $(GCC_WARNINGS)
 
-EXTRA_DIST = \
+AM_CPPFLAGS = $(HOST_CPPFLAGS)\
+                         -I$(top_srcdir)/src \
+                         -I$(top_builddir)/src \
+                         -DPKGDATADIR=\"$(pkgdatadir)\" \
+                         -DBINDIR=\"$(bindir)\"
+
+if INTERNAL_JIMTCL
+AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
+                          -I$(top_builddir)/jimtcl
+endif
+EXTRA_DIST += \
        BUGS \
        HACKING \
        NEWTAPS \
        README.Windows \
-       README.OSX \
+       README.macOS \
+       $(EXTRA_DIST_NEWS) \
        Doxyfile.in \
+       LICENSES/license-rules.txt \
+       LICENSES/preferred/BSD-1-Clause \
+       LICENSES/preferred/BSD-2-Clause \
+       LICENSES/preferred/BSD-3-Clause \
+       LICENSES/preferred/GFDL-1.2 \
+       LICENSES/preferred/gfdl-1.2.texi.readme \
+       LICENSES/preferred/GPL-2.0 \
+       LICENSES/preferred/MIT \
+       LICENSES/stand-alone/GPL-3.0 \
        tools/logger.pl \
-       contrib/loaders
+       tools/rlink_make_speed_table \
+       tools/st7_dtc_as \
+       contrib
 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
@@ -93,17 +128,26 @@ distclean-local:
 
 DISTCLEANFILES = doxygen.log
 
+METASOURCES = AUTO
+
+BUILT_SOURCES =
+CLEANFILES =
+
 MAINTAINERCLEANFILES = \
-       $(srcdir)/INSTALL \
-       $(srcdir)/configure \
-       $(srcdir)/Makefile.in \
-       $(srcdir)/depcomp \
-       $(srcdir)/config.guess \
-       $(srcdir)/config.sub \
-       $(srcdir)/config.h.in \
-       $(srcdir)/config.h.in~ \
-       $(srcdir)/compile \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
-       $(srcdir)/aclocal.m4 \
-       $(srcdir)/install-sh
+       %D%/INSTALL \
+       %D%/configure \
+       %D%/Makefile.in \
+       %D%/depcomp \
+       %D%/config.guess \
+       %D%/config.sub \
+       %D%/config.h.in \
+       %D%/config.h.in~ \
+       %D%/compile \
+       %D%/ltmain.sh \
+       %D%/missing \
+       %D%/aclocal.m4 \
+       %D%/install-sh \
+       %D%/texinfo.tex
+
+include src/Makefile.am
+include doc/Makefile.am