Convert to non-recursive make

[openocd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0d20233..579d3a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,25 +10,47 @@ nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.h \
        contrib/libdcc/example.c \
        contrib/libdcc/README \
        contrib/libdcc/dcc_stdio.h \
        contrib/libdcc/example.c \
        contrib/libdcc/README \

-       contrib/openocd.udev
+       contrib/99-openocd.rules

 
 

-if INTERNAL_JIMTCL
-SUBDIRS = jimtcl
-else

 SUBDIRS =
 SUBDIRS =

+DIST_SUBDIRS =
+bin_PROGRAMS =
+noinst_LTLIBRARIES =
+info_TEXINFOS =
+dist_man_MANS =
+EXTRA_DIST =
+
+if INTERNAL_JIMTCL
+SUBDIRS += jimtcl
+DIST_SUBDIRS += jimtcl

 endif
 
 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 \
+                         -I$(top_srcdir)/src/helper \
+                         -DPKGDATADIR=\"$(pkgdatadir)\" \
+                         -DBINDIR=\"$(bindir)\"
+
+if INTERNAL_JIMTCL
+AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
+                          -I$(top_builddir)/jimtcl
+endif
+EXTRA_DIST += \

        BUGS \
        HACKING \
        NEWTAPS \
        BUGS \
        HACKING \
        NEWTAPS \

-       PATCHES.txt \
-       README.Win32 \
+       README.Windows \
+       README.OSX \
+       $(wildcard $(srcdir)/NEWS*) \

        Doxyfile.in \
        tools/logger.pl \
        Doxyfile.in \
        tools/logger.pl \

-       contrib/loaders
+       tools/rlink_make_speed_table \
+       tools/st7_dtc_as \
+       contrib

 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck


@@ -64,7 +86,7 @@ $(THE_MANUAL): %.pdf: %.tex
 
 TCL_PATH = tcl
 # command to find paths of script files, relative to TCL_PATH
 
 TCL_PATH = tcl
 # command to find paths of script files, relative to TCL_PATH

-TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
+TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '*.txt' | \

                sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 
 dist-hook:
                sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 
 dist-hook:


@@ -90,20 +112,29 @@ uninstall-hook:
 distclean-local:
        rm -rf Doxyfile doxygen
        rm -f $(srcdir)/jimtcl/configure.gnu
 distclean-local:
        rm -rf Doxyfile doxygen
        rm -f $(srcdir)/jimtcl/configure.gnu

-       
+

 DISTCLEANFILES = doxygen.log
 
 DISTCLEANFILES = doxygen.log
 

+METASOURCES = AUTO
+
+BUILT_SOURCES =
+CLEANFILES =
+

 MAINTAINERCLEANFILES = \
 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