diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-06-05 14:16:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-06-12 22:29:23 +0100 |
| commit | 4e3d5d30f673c7cc52a7aa2a50f7fda34bc1f4cc (patch) | |
| tree | dcc032b92ea5a71785b95f540a7bed4516d244cb /Makefile.in | |
| parent | 09dbdc750e4612cb7a2db5331b6e9d6278d7f3c0 (diff) | |
Revert "- Dropped contrib/"
This reverts commit 206336e601c61264d4dd7b6c031b5cc96b7e3f44.
Conflicts:
Makefile.in
configure
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 6738493..436e968 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,8 @@ host_triplet = @host@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in AUTHORS COPYING INSTALL NEWS README \ + $(srcdir)/config.h.in $(top_srcdir)/contrib/help/Makefile.in \ + AUTHORS COPYING INSTALL NEWS README \ compile config.guess config.sub depcomp install-sh missing \ ylwrap ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -102,7 +103,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = contrib/help/Makefile CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -400,6 +401,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +contrib/help/Makefile: $(top_builddir)/config.status $(top_srcdir)/contrib/help/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo |