From 9675b7bdbbd85817b7171aa05904870746e3efbf Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 8 Jan 2022 11:56:02 +0300
Subject: [PATCH] use an explicit list of txt files in EXTRA_DIST
also fix the name of the rpm spec file.
---
Makefile.am | 11 +++++------
Makefile.in | 16 +++++++---------
SDL_rtf.spec.in => SDL2_rtf.spec.in | 0
configure | 6 +++---
configure.ac | 4 ++--
5 files changed, 17 insertions(+), 20 deletions(-)
rename SDL_rtf.spec.in => SDL2_rtf.spec.in (100%)
diff --git a/Makefile.am b/Makefile.am
index aa6d62d..7f21f47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,14 +17,13 @@ libSDL2_rtf_la_SOURCES = \
SDL_rtfreadr.h \
SDL_rtf.c
-EXTRA_DIST = \
+EXTRA_DIST = CHANGES.txt COPYING.txt README.txt \
version.rc \
Makefile.os2 \
- SDL_rtf.spec \
- SDL_rtf.spec.in \
- gcc-fat.sh \
- autogen.sh \
- $(srcdir)/*.txt
+ SDL2_rtf.spec \
+ SDL2_rtf.spec.in \
+ autogen.sh gcc-fat.sh
+
if USE_VERSION_RC
libSDL2_rtf_la_LDFLAGS = \
diff --git a/Makefile.in b/Makefile.in
index 3db42d9..0774d7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,7 +108,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = SDL_rtf.spec
+CONFIG_CLEAN_FILES = SDL2_rtf.spec
CONFIG_CLEAN_VPATH_FILES =
@HAVE_SDL_TTF_TRUE@am__EXEEXT_1 = showrtf$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
@@ -223,7 +223,7 @@ am__define_uniq_tagged_files = \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
AM_RECURSIVE_TARGETS = cscope
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SDL_rtf.spec.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SDL2_rtf.spec.in \
compile config.guess config.sub depcomp install-sh ltmain.sh \
missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -400,14 +400,12 @@ libSDL2_rtf_la_SOURCES = \
SDL_rtfreadr.h \
SDL_rtf.c
-EXTRA_DIST = \
+EXTRA_DIST = CHANGES.txt COPYING.txt README.txt \
version.rc \
Makefile.os2 \
- SDL_rtf.spec \
- SDL_rtf.spec.in \
- gcc-fat.sh \
- autogen.sh \
- $(srcdir)/*.txt
+ SDL2_rtf.spec \
+ SDL2_rtf.spec.in \
+ autogen.sh gcc-fat.sh
@USE_VERSION_RC_FALSE@libSDL2_rtf_la_LDFLAGS = \
@USE_VERSION_RC_FALSE@ -no-undefined \
@@ -462,7 +460,7 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-SDL_rtf.spec: $(top_builddir)/config.status $(srcdir)/SDL_rtf.spec.in
+SDL2_rtf.spec: $(top_builddir)/config.status $(srcdir)/SDL2_rtf.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstPROGRAMS:
diff --git a/SDL_rtf.spec.in b/SDL2_rtf.spec.in
similarity index 100%
rename from SDL_rtf.spec.in
rename to SDL2_rtf.spec.in
diff --git a/configure b/configure
index 12325d9..00d6dc8 100755
--- a/configure
+++ b/configure
@@ -10754,7 +10754,7 @@ fi
# Define the identity of the package.
- PACKAGE=SDL_rtf
+ PACKAGE=SDL2_rtf
VERSION=$VERSION
@@ -12377,7 +12377,7 @@ CheckVisibilityHidden
# Finally create all the generated files
-ac_config_files="$ac_config_files Makefile SDL_rtf.spec"
+ac_config_files="$ac_config_files Makefile SDL2_rtf.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -13387,7 +13387,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "SDL_rtf.spec") CONFIG_FILES="$CONFIG_FILES SDL_rtf.spec" ;;
+ "SDL2_rtf.spec") CONFIG_FILES="$CONFIG_FILES SDL2_rtf.spec" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/configure.ac b/configure.ac
index dcdd88c..b9bb187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ dnl Detect the canonical build and host environments
AC_CANONICAL_HOST
dnl Setup for automake
-AM_INIT_AUTOMAKE(SDL_rtf, $VERSION)
+AM_INIT_AUTOMAKE(SDL2_rtf, $VERSION)
dnl Check for tools
AC_PROG_CC
@@ -150,6 +150,6 @@ AC_SUBST([WINDRES])
# Finally create all the generated files
AC_CONFIG_FILES([
Makefile
-SDL_rtf.spec
+SDL2_rtf.spec
])
AC_OUTPUT