From 8be57904461714cc2ea6d1bfb9e82f48808c24a2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 14 Apr 2022 07:22:58 +0300 Subject: [PATCH 44/44] Remove trailing spaces from Makefile.am files See osdn #44368 Signed-off-by: Marko Lindqvist --- ai/Makefile.am | 2 +- client/Makefile.am | 6 +++--- client/agents/Makefile.am | 2 +- data/Makefile.am | 2 +- data/nation/Makefile.am | 2 +- data/themes/gui-qt/Necrophos/Makefile.am | 2 +- data/themes/gui-qt/NightStalker/Makefile.am | 2 +- data/themes/gui-qt/System/Makefile.am | 2 +- server/Makefile.am | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ai/Makefile.am b/ai/Makefile.am index 74c5ddeb98..2e56eee1e6 100644 --- a/ai/Makefile.am +++ b/ai/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -module_dirs = +module_dirs = if AI_MOD_DEFAULT_NEEDED module_dirs += default diff --git a/client/Makefile.am b/client/Makefile.am index 6dfc6ddd7f..a08452675c 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -49,14 +49,14 @@ endif EXTRA_DIST= $(ALL_AUDIO_SDL_FILES) -## This is usually false, so "include" is not recursed into +## This is usually false, so "include" is not recursed into ## by 'make', but it can be enabled in configure, and it is -## necessary to have something like this so that the include +## necessary to have something like this so that the include ## directory is included for 'make dist'. if MAKE_CLIENT_INCLUDE CLI_INCLUDE = include else -CLI_INCLUDE = +CLI_INCLUDE = endif if CLIENT diff --git a/client/agents/Makefile.am b/client/agents/Makefile.am index bb53540157..23641d3176 100644 --- a/client/agents/Makefile.am +++ b/client/agents/Makefile.am @@ -21,4 +21,4 @@ libagents_la_SOURCES = \ cma_fec.c \ cma_fec.h \ sha.c \ - sha.h + sha.h diff --git a/data/Makefile.am b/data/Makefile.am index 4c070632d5..abf64b87c4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -86,7 +86,7 @@ if CLIENT CLIENTDATADIRS = amplio2 misc flags buildings cimpletoon isotrident trident\ isophex hex2t hexemplio alio stdsounds stdmusic themes wonders else -CLIENTDATADIRS = +CLIENTDATADIRS = endif SRV_RE_DATADIRS = default classic civ1 civ2 sandbox multiplayer \ diff --git a/data/nation/Makefile.am b/data/nation/Makefile.am index 36051bdda6..cb45347c75 100644 --- a/data/nation/Makefile.am +++ b/data/nation/Makefile.am @@ -563,7 +563,7 @@ pkgdata_DATA = \ zapotec.ruleset \ zhuang.ruleset \ zimbabwean.ruleset \ - zulu.ruleset + zulu.ruleset EXTRA_DIST = $(pkgdata_DATA) Makefile.am.sh diff --git a/data/themes/gui-qt/Necrophos/Makefile.am b/data/themes/gui-qt/Necrophos/Makefile.am index a5f559b392..9f2704e5c2 100644 --- a/data/themes/gui-qt/Necrophos/Makefile.am +++ b/data/themes/gui-qt/Necrophos/Makefile.am @@ -25,6 +25,6 @@ pkgdata_DATA = \ sun.png \ units.png \ view.png \ - wheel.png + wheel.png EXTRA_DIST = $(pkgdata_DATA) diff --git a/data/themes/gui-qt/NightStalker/Makefile.am b/data/themes/gui-qt/NightStalker/Makefile.am index 9392f57f3a..259d02e2e5 100644 --- a/data/themes/gui-qt/NightStalker/Makefile.am +++ b/data/themes/gui-qt/NightStalker/Makefile.am @@ -31,6 +31,6 @@ pkgdata_DATA = \ sun.png \ units.png \ view.png \ - wheel.png + wheel.png EXTRA_DIST = $(pkgdata_DATA) diff --git a/data/themes/gui-qt/System/Makefile.am b/data/themes/gui-qt/System/Makefile.am index d9f79c97f8..d2ea9f8041 100644 --- a/data/themes/gui-qt/System/Makefile.am +++ b/data/themes/gui-qt/System/Makefile.am @@ -4,6 +4,6 @@ pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-qt/System pkgdata_DATA = \ - resource.qss + resource.qss EXTRA_DIST = $(pkgdata_DATA) diff --git a/server/Makefile.am b/server/Makefile.am index a6a8a1b5b6..59fd0ddddd 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -125,7 +125,7 @@ libfreeciv_srv_la_SOURCES = \ # outside this directory (when building common) there's no point in # setting them to BUILT_SOURCES. -da_libs = +da_libs = if AI_MOD_DEFAULT_NEEDED da_libs += $(top_builddir)/ai/default/libdefaultai.la -- 2.35.1