From b03432a23e3b775aeef3fbb5be77aeb763bb2bc0 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 8 May 2022 17:03:10 +0300
Subject: [PATCH] fix 'make dist', tidy-up.
---
Makefile.am | 22 ++++++++--------------
Makefile.in | 22 ++++++++--------------
2 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8ebae5a..0c16faf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,16 +141,10 @@ pkgconfig_DATA = SDL2_ttf.pc
$(RC) $< $@
EXTRA_DIST = CHANGES.txt COPYING.txt README.txt \
- Android.mk \
- Makefile.os2 \
- Xcode \
- VisualC \
- VisualC-WinRT \
- version.rc \
- external \
- SDL2_ttf.spec \
- SDL2_ttf.spec.in \
- SDL2_ttfConfig.cmake \
+ Android.mk Makefile.os2 version.rc \
+ VisualC VisualC-WinRT Xcode external \
+ SDL2_ttf.spec SDL2_ttf.spec.in \
+ SDL2_ttfConfig.cmake \
autogen.sh gcc-fat.sh
noinst_PROGRAMS = showfont glfont
@@ -167,9 +161,9 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz
distclean-local:
-rm -rf `find $(srcdir) -name .deps`
-
dist-hook:
-rm -rf `find $(distdir) -name .deps`
- -rm -rf `find $(distdir)/external -name .git*`
- -rm -rf `find $(distdir)/external -name .ci*`
- -rm -rf `find $(distdir)/external/harfbuzz/test`
+ -rm -rf `find $(distdir)/external -name '.git*'`
+ -rm -rf `find $(distdir)/external -name '.ci*'`
+ -rm -rf `find $(distdir)/external -name .dirstamp`
+ -rm -rf $(distdir)/external/harfbuzz/test
diff --git a/Makefile.in b/Makefile.in
index e92ec59..02edc12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -815,16 +815,10 @@ libSDL2_ttf_la_LIBADD = $(TTF_LIBS) @MATHLIB@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = SDL2_ttf.pc
EXTRA_DIST = CHANGES.txt COPYING.txt README.txt \
- Android.mk \
- Makefile.os2 \
- Xcode \
- VisualC \
- VisualC-WinRT \
- version.rc \
- external \
- SDL2_ttf.spec \
- SDL2_ttf.spec.in \
- SDL2_ttfConfig.cmake \
+ Android.mk Makefile.os2 version.rc \
+ VisualC VisualC-WinRT Xcode external \
+ SDL2_ttf.spec SDL2_ttf.spec.in \
+ SDL2_ttfConfig.cmake \
autogen.sh gcc-fat.sh
showfont_LDADD = libSDL2_ttf.la
@@ -2857,12 +2851,12 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz
distclean-local:
-rm -rf `find $(srcdir) -name .deps`
-
dist-hook:
-rm -rf `find $(distdir) -name .deps`
- -rm -rf `find $(distdir)/external -name .git*`
- -rm -rf `find $(distdir)/external -name .ci*`
- -rm -rf `find $(distdir)/external/harfbuzz/test`
+ -rm -rf `find $(distdir)/external -name '.git*'`
+ -rm -rf `find $(distdir)/external -name '.ci*'`
+ -rm -rf `find $(distdir)/external -name .dirstamp`
+ -rm -rf $(distdir)/external/harfbuzz/test
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.