From 23b4b8f13a76a5176cc8dac18cb72e8efa566c6a Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Mon, 27 Jan 2020 21:10:45 -0600 Subject: [PATCH] Pi built! --- .gitignore | 1 + makePiRoot.sh | 30 +++++++++++++++ singe/buildRelease.sh | 9 +++++ singe/preBuild.sh | 37 ++++++++++++++++--- .../external/libwebp-1.0.3/Makefile.in | 4 +- .../external/tiff-4.1.0/Makefile.in | 4 +- .../external/tiff-4.1.0/build/Makefile.in | 4 +- .../external/tiff-4.1.0/contrib/Makefile.in | 4 +- .../tiff-4.1.0/contrib/addtiffo/Makefile.in | 4 +- .../tiff-4.1.0/contrib/dbs/Makefile.in | 4 +- .../tiff-4.1.0/contrib/dbs/xtiff/Makefile.in | 4 +- .../tiff-4.1.0/contrib/iptcutil/Makefile.in | 4 +- .../tiff-4.1.0/contrib/mfs/Makefile.in | 4 +- .../tiff-4.1.0/contrib/pds/Makefile.in | 4 +- .../tiff-4.1.0/contrib/ras/Makefile.in | 4 +- .../tiff-4.1.0/contrib/stream/Makefile.in | 4 +- .../tiff-4.1.0/contrib/tags/Makefile.in | 4 +- .../tiff-4.1.0/contrib/win_dib/Makefile.in | 4 +- .../external/tiff-4.1.0/html/Makefile.in | 4 +- .../tiff-4.1.0/html/images/Makefile.in | 4 +- .../external/tiff-4.1.0/html/man/Makefile.in | 4 +- .../external/tiff-4.1.0/libtiff/Makefile.in | 4 +- .../external/tiff-4.1.0/man/Makefile.in | 4 +- .../external/tiff-4.1.0/port/Makefile.in | 4 +- .../external/tiff-4.1.0/tools/Makefile.in | 4 +- .../external/flac-1.3.3/Makefile.in | 2 +- .../external/flac-1.3.3/doc/html/Makefile.in | 2 +- .../external/libmodplug-0.8.9.0/Makefile.in | 2 +- .../external/libvorbis-1.3.6/Makefile.in | 2 +- .../external/opusfile-0.11/Makefile.in | 2 +- 30 files changed, 119 insertions(+), 52 deletions(-) create mode 100755 makePiRoot.sh diff --git a/.gitignore b/.gitignore index da95c3a7d..32a7ab91b 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ singe/icon.h singe/kangarooPunchLogo.h singe/singeLogo.h videotest/indexing/ +Makefile.in diff --git a/makePiRoot.sh b/makePiRoot.sh new file mode 100755 index 000000000..38c5c4c32 --- /dev/null +++ b/makePiRoot.sh @@ -0,0 +1,30 @@ +#!/bin/bash -x + +IMAGE=2019-09-26-raspbian-buster.img +DIST=buster + + +MY_UID=`id -u` +MY_GID=`id -g` + +mkdir -p ${DIST} + +7z e ${IMAGE} 1.img + +pushd ${DIST} +7z x ../1.img +popd + +rm 1.img + +mkdir -p /tmp/mnt-${DIST} +sudo mount 1.img /tmp/mnt-${DIST} +sudo cp -ax /tmp/mnt-${DIST}/. ${DIST}/ +sudo chown -R ${MY_UID}:${MY_GID} ${DIST} +sudo umount /tmp/mnt-${DIST} + +proot -S ${DIST} -q qemu-arm apt-get -y update +proot -S ${DIST} -q qemu-arm apt-get -y upgrade +proot -S ${DIST} -q qemu-arm apt-get -y install libxv-dev libx11-dev libxext-dev libxi-dev + +touch ${DIST}/usr/include/immintrin.h diff --git a/singe/buildRelease.sh b/singe/buildRelease.sh index 9b1305c6c..51f227959 100755 --- a/singe/buildRelease.sh +++ b/singe/buildRelease.sh @@ -66,12 +66,14 @@ function doBuild() { } +# 64 Bit Linux CROSS="x86_64-linux-gnu" EXTRA_CFLAGS="" EXTRA_OFILES="" EXTRA_LD_FLAGS="-l:everything.a -lpthread -lXv -lX11 -lXext -lm -ldl -lrt" doBuild Singe-Linux-x86_64 linux 64 +# 64 Bit Windows CROSS="x86_64-w64-mingw32" EXTRA_CFLAGS="" EXTRA_OFILES="/tmp/singe.res" @@ -81,3 +83,10 @@ x86_64-w64-mingw32-windres singe.rc -O coff -o /tmp/singe.res doBuild Singe-Windows-x86_64 mingw 64 .exe rm /tmp/icon.ico rm /tmp/singe.res + +# 32 Bit Raspbian +CROSS="arm-linux-gnueabihf" +EXTRA_CFLAGS="--sysroot /opt/cross/pi/buster" +EXTRA_OFILES="" +EXTRA_LD_FLAGS="--sysroot /opt/cross/pi/buster -l:everything.a -lpthread -lXv -lX11 -lXext -lm -ldl -lrt" +doBuild Singe-Pi-armv6 pi 32 diff --git a/singe/preBuild.sh b/singe/preBuild.sh index 6a1d4485e..fb43088f3 100755 --- a/singe/preBuild.sh +++ b/singe/preBuild.sh @@ -21,10 +21,10 @@ if [[ -z $1 ]]; then -# G_PLATFORM=pi + G_PLATFORM=pi # G_PLATFORM=mingw - G_PLATFORM=linux - G_BITS=64 +# G_PLATFORM=linux + G_BITS=32 G_THIRDPARTY=$(pwd)/thirdparty G_DEST="$(pwd)/../thirdparty-build/${G_PLATFORM}/${G_BITS}" else @@ -39,7 +39,8 @@ G_L="--------------------------------------------------------------------------- # Work out compiler settings case "${G_PLATFORM}" in - pi) + + pi-broke) G_CROSS_HOME="/opt/cross/pi/32bit/bin" G_OS="linux" G_CCOMPILER="${G_CROSS_HOME}/arm-unknown-linux-gnueabi-gcc" @@ -49,6 +50,25 @@ case "${G_PLATFORM}" in G_ARCH="armv6" ;; + pi) + G_OS="linux" + G_CCOMPILER="arm-linux-gnueabihf-gcc" + G_CPPCOMPILER="arm-linux-gnueabihf-g++" + G_CROSS="arm-linux-gnueabihf" + G_LUAPLAT="posix" + G_ARCH="armv6" + G_SYSROOT="/opt/cross/pi/buster" + ;; + + pi64) + G_OS="linux" + G_CCOMPILER="aarch64-linux-gnu-gcc" + G_CPPCOMPILER="aarch64-linux-gnu-g++" + G_CROSS="aarch64-linux-gnu" + G_LUAPLAT="posix" + G_ARCH="aarch64" + ;; + linux) G_OS="linux" G_CCOMPILER="gcc" @@ -93,12 +113,19 @@ function autoBuild() { else autoreconf --force --install || true fi + if [[ -e configure.ac ]]; then + automake --add-missing || true + fi make distclean || true make clean || true popd mkdir -p "${G_DEST}/${LOCATION}" pushd "${G_DEST}/${LOCATION}" - + + if [[ ! -z ${G_SYSROOT} ]]; then + MORE_CFLAGS="--sysroot=${G_SYSROOT} ${MORE_CFLAGS}" + fi + export CC=${G_CCOMPILER} export CXX=${G_CPPCOMPILER} export CFLAGS="-isystem${G_INSTALLED}/include ${MORE_CFLAGS}" diff --git a/singe/thirdparty/SDL2_image/external/libwebp-1.0.3/Makefile.in b/singe/thirdparty/SDL2_image/external/libwebp-1.0.3/Makefile.in index e6a17acab..ea1a78034 100644 --- a/singe/thirdparty/SDL2_image/external/libwebp-1.0.3/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/libwebp-1.0.3/Makefile.in @@ -162,8 +162,8 @@ CSCOPE = cscope DIST_SUBDIRS = src imageio man extras examples am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/src/webp/config.h.in AUTHORS COPYING ChangeLog \ - NEWS README ar-lib compile config.guess config.sub install-sh \ - ltmain.sh missing + NEWS README ar-lib compile config.guess config.sub depcomp \ + install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/Makefile.in index 03f67987b..9f0937b41 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/Makefile.in @@ -220,8 +220,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libtiff-4.pc.in \ $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ $(top_srcdir)/config/missing ChangeLog TODO config/compile \ - config/config.guess config/config.sub config/install-sh \ - config/ltmain.sh config/missing + config/config.guess config/config.sub config/depcomp \ + config/install-sh config/ltmain.sh config/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/build/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/build/Makefile.in index 6be0cd9ef..a683199b3 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/build/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/build/Makefile.in @@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign build/Makefile + $(AUTOMAKE) --gnu build/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/Makefile.in index af9eed086..d110ab14b 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/Makefile.in @@ -374,9 +374,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/Makefile + $(AUTOMAKE) --gnu contrib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/addtiffo/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/addtiffo/Makefile.in index 70c9b502d..a3a33e288 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/addtiffo/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/addtiffo/Makefile.in @@ -371,9 +371,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/addtiffo/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/addtiffo/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/addtiffo/Makefile + $(AUTOMAKE) --gnu contrib/addtiffo/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/Makefile.in index a79323635..b2d52b508 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/Makefile.in @@ -430,9 +430,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/dbs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/dbs/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/dbs/Makefile + $(AUTOMAKE) --gnu contrib/dbs/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/xtiff/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/xtiff/Makefile.in index 27ae82d51..60e797a74 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/xtiff/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/dbs/xtiff/Makefile.in @@ -319,9 +319,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/dbs/xtiff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/dbs/xtiff/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/dbs/xtiff/Makefile + $(AUTOMAKE) --gnu contrib/dbs/xtiff/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/iptcutil/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/iptcutil/Makefile.in index 84f0016ae..866c84b37 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/iptcutil/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/iptcutil/Makefile.in @@ -371,9 +371,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/iptcutil/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/iptcutil/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/iptcutil/Makefile + $(AUTOMAKE) --gnu contrib/iptcutil/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/mfs/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/mfs/Makefile.in index 919dfaebb..ccd5d7d68 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/mfs/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/mfs/Makefile.in @@ -314,9 +314,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/mfs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/mfs/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/mfs/Makefile + $(AUTOMAKE) --gnu contrib/mfs/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/pds/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/pds/Makefile.in index 8af605a68..3a33619d9 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/pds/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/pds/Makefile.in @@ -317,9 +317,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/pds/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/pds/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/pds/Makefile + $(AUTOMAKE) --gnu contrib/pds/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/ras/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/ras/Makefile.in index 00e21093e..3e46b67ea 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/ras/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/ras/Makefile.in @@ -315,9 +315,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/ras/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/ras/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/ras/Makefile + $(AUTOMAKE) --gnu contrib/ras/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/stream/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/stream/Makefile.in index 0c2f12761..f0108599c 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/stream/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/stream/Makefile.in @@ -315,9 +315,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/stream/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/stream/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/stream/Makefile + $(AUTOMAKE) --gnu contrib/stream/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/tags/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/tags/Makefile.in index 7ed2c2870..33d72b898 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/tags/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/tags/Makefile.in @@ -318,9 +318,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/tags/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/tags/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/tags/Makefile + $(AUTOMAKE) --gnu contrib/tags/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/win_dib/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/win_dib/Makefile.in index 545750668..2e62735ac 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/win_dib/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/contrib/win_dib/Makefile.in @@ -317,9 +317,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/win_dib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/win_dib/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/win_dib/Makefile + $(AUTOMAKE) --gnu contrib/win_dib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/Makefile.in index 6ce5ccbdc..8d9fa9b1f 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/Makefile.in @@ -470,9 +470,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign html/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu html/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign html/Makefile + $(AUTOMAKE) --gnu html/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/images/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/images/Makefile.in index 82c5b249b..1362be95c 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/images/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/images/Makefile.in @@ -362,9 +362,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign html/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu html/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign html/images/Makefile + $(AUTOMAKE) --gnu html/images/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/man/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/man/Makefile.in index a43168fdd..71f7e1d14 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/man/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/html/man/Makefile.in @@ -418,9 +418,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign html/man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu html/man/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign html/man/Makefile + $(AUTOMAKE) --gnu html/man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/libtiff/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/libtiff/Makefile.in index 410a14e3d..0a1989b7e 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/libtiff/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/libtiff/Makefile.in @@ -506,9 +506,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libtiff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libtiff/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign libtiff/Makefile + $(AUTOMAKE) --gnu libtiff/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/man/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/man/Makefile.in index cb710b47c..5cda12658 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/man/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/man/Makefile.in @@ -412,9 +412,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign man/Makefile + $(AUTOMAKE) --gnu man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/port/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/port/Makefile.in index 46575ee90..7c75e4a87 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/port/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/port/Makefile.in @@ -372,9 +372,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign port/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu port/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign port/Makefile + $(AUTOMAKE) --gnu port/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/tools/Makefile.in b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/tools/Makefile.in index 4ae20dd4d..8b91cfc7e 100644 --- a/singe/thirdparty/SDL2_image/external/tiff-4.1.0/tools/Makefile.in +++ b/singe/thirdparty/SDL2_image/external/tiff-4.1.0/tools/Makefile.in @@ -500,9 +500,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign tools/Makefile + $(AUTOMAKE) --gnu tools/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/Makefile.in b/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/Makefile.in index 1d5881aa8..eb3435113 100644 --- a/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/Makefile.in +++ b/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/Makefile.in @@ -205,7 +205,7 @@ DIST_SUBDIRS = doc include m4 man src test build objs microbench \ examples am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ README ar-lib compile config.guess config.rpath config.sub \ - install-sh ltmain.sh missing + depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/doc/html/Makefile.in b/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/doc/html/Makefile.in index 3af9abfe8..8e2cf0807 100644 --- a/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/doc/html/Makefile.in +++ b/singe/thirdparty/SDL2_mixer/external/flac-1.3.3/doc/html/Makefile.in @@ -668,8 +668,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." @FLaC__HAS_DOXYGEN_FALSE@distclean-local: -@FLaC__HAS_DOXYGEN_FALSE@install-data-local: @FLaC__HAS_DOXYGEN_FALSE@uninstall-local: +@FLaC__HAS_DOXYGEN_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am diff --git a/singe/thirdparty/SDL2_mixer/external/libmodplug-0.8.9.0/Makefile.in b/singe/thirdparty/SDL2_mixer/external/libmodplug-0.8.9.0/Makefile.in index 40c83ea43..b57055676 100644 --- a/singe/thirdparty/SDL2_mixer/external/libmodplug-0.8.9.0/Makefile.in +++ b/singe/thirdparty/SDL2_mixer/external/libmodplug-0.8.9.0/Makefile.in @@ -191,7 +191,7 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libmodplug.pc.in \ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \ - config.guess config.sub install-sh ltmain.sh missing + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/singe/thirdparty/SDL2_mixer/external/libvorbis-1.3.6/Makefile.in b/singe/thirdparty/SDL2_mixer/external/libvorbis-1.3.6/Makefile.in index ff4a3c4a0..47395f116 100644 --- a/singe/thirdparty/SDL2_mixer/external/libvorbis-1.3.6/Makefile.in +++ b/singe/thirdparty/SDL2_mixer/external/libvorbis-1.3.6/Makefile.in @@ -201,7 +201,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/vorbisenc.pc.in \ $(srcdir)/vorbisfile-uninstalled.pc.in \ $(srcdir)/vorbisfile.pc.in AUTHORS COPYING compile \ - config.guess config.sub install-sh ltmain.sh missing + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/singe/thirdparty/SDL2_mixer/external/opusfile-0.11/Makefile.in b/singe/thirdparty/SDL2_mixer/external/opusfile-0.11/Makefile.in index 2ce5de6c0..9a32b3c27 100644 --- a/singe/thirdparty/SDL2_mixer/external/opusfile-0.11/Makefile.in +++ b/singe/thirdparty/SDL2_mixer/external/opusfile-0.11/Makefile.in @@ -1018,9 +1018,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@HAVE_DOXYGEN_FALSE@install-data-local: @HAVE_DOXYGEN_FALSE@clean-local: @HAVE_DOXYGEN_FALSE@uninstall-local: -@HAVE_DOXYGEN_FALSE@install-data-local: clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \