diff options
| author | dos-reis <gdr@axiomatics.org> | 2014-10-04 00:50:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2014-10-04 00:50:57 +0000 |
| commit | 564aff97f80abac84be64552f5238903cb126c33 (patch) | |
| tree | 0ba82ae0f8e4249eb1dc37a7662219523f5d3cd4 /Makefile.in | |
| parent | 33259a6291be67fdc2545024f8fd5ff9603fd8dd (diff) | |
| download | open-axiom-564aff97f80abac84be64552f5238903cb126c33.tar.gz | |
Fix QT5 toAscii() compatibility issue.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 06d89f4c..584a28dd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -170,7 +170,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ INSTALL NEWS README TODO config/compile config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/missing config/mkinstalldirs config/ltmain.sh \ - $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.guess \ $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ $(top_srcdir)/config/missing @@ -553,8 +553,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config/openaxiom-c-macros.h: config/stamp-h1 - @test -f $@ || rm -f config/stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1 + @if test ! -f $@; then rm -f config/stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; else :; fi config/stamp-h1: $(top_srcdir)/config/openaxiom-c-macros.h.in $(top_builddir)/config.status @rm -f config/stamp-h1 @@ -801,16 +801,10 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -852,10 +846,9 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ |