aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2014-02-27 19:23:16 +0000
committerivan.penkov@gmail.com <ivan.penkov@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2014-02-27 19:23:16 +0000
commit70acad5df85e0224b2fae231c68533b30ffb8870 (patch)
treea8cc83272dd41a63dfd21931f0f86d3e1a908eb2 /Makefile.in
parentInitialize file descriptors to -1, not 0, in MachoWalker. (diff)
downloadbreakpad-70acad5df85e0224b2fae231c68533b30ffb8870.tar.xz
Renaming file COPYING to LICENSE and appending the disclaimer from src/common/convert_UTF.h to LICENSE.
R=mark@chromium.org Review URL: https://breakpad.appspot.com/1174003 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1285 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in25
1 files changed, 14 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in
index 4a0a012b..95162002 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -204,14 +204,14 @@ check_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
noinst_PROGRAMS =
subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(top_srcdir)/src/config.h.in $(top_srcdir)/autotools/depcomp \
- $(dist_doc_DATA) $(top_srcdir)/autotools/test-driver COPYING \
- autotools/compile autotools/config.guess autotools/config.sub \
- autotools/depcomp autotools/install-sh autotools/missing \
- autotools/ltmain.sh $(top_srcdir)/autotools/compile \
+ $(dist_doc_DATA) $(top_srcdir)/autotools/test-driver AUTHORS \
+ ChangeLog INSTALL NEWS README autotools/compile \
+ autotools/config.guess autotools/config.sub autotools/depcomp \
+ autotools/install-sh autotools/missing autotools/ltmain.sh \
+ $(top_srcdir)/autotools/compile \
$(top_srcdir)/autotools/config.guess \
$(top_srcdir)/autotools/config.sub \
$(top_srcdir)/autotools/install-sh \
@@ -1748,11 +1748,14 @@ AM_CXXFLAGS = $(am__append_1) $(am__append_2) $(am__append_4)
# Specify include paths for ac macros
ACLOCAL_AMFLAGS = -I m4
+
+# License file is called LICENSE not COPYING
+AUTOMAKE_OPTIONS = foreign
dist_doc_DATA = \
AUTHORS \
- COPYING \
ChangeLog \
INSTALL \
+ LICENSE \
NEWS \
README
@@ -2809,15 +2812,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \