X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=Makefile.am;h=930a3073388033a4fe2ee31362b2965d3cab86c6;hp=3640dbc540216a877c5bde24db8150cab6c64c15;hb=b3d4c97b9f441b1dfe36f26d64bb80974ee06ee3;hpb=e3bb6d390c6e55daa24592ec168fdd114c035c9f

diff --git a/Makefile.am b/Makefile.am
index 3640dbc540..930a307338 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,30 +5,56 @@ AUTOMAKE_OPTIONS = gnu 1.6
 # 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:
+	@true
+
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \
 	contrib/libdcc/example.c \
 	contrib/libdcc/README \
-	contrib/99-openocd.rules
+	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)
+
+AM_CPPFLAGS = $(HOST_CPPFLAGS)\
+			  -I$(top_srcdir)/src \
+			  -I$(top_builddir)/src \
+			  -I$(top_srcdir)/src/helper \
+			  -DPKGDATADIR=\"$(pkgdatadir)\" \
+			  -DBINDIR=\"$(bindir)\"
 
-EXTRA_DIST = \
+if INTERNAL_JIMTCL
+AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
+			   -I$(top_builddir)/jimtcl
+endif
+EXTRA_DIST += \
 	BUGS \
 	HACKING \
 	NEWTAPS \
 	README.Windows \
 	README.OSX \
+	$(wildcard $(srcdir)/NEWS*) \
 	Doxyfile.in \
 	tools/logger.pl \
-	contrib/loaders
+	tools/rlink_make_speed_table \
+	tools/st7_dtc_as \
+	contrib
 
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
@@ -93,17 +119,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