<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40349 >
I haven't looked up documentation on this but my feeling is these are bad - and, in every case I could find, unnecessary. "make dist" assumes all conditionals pass to find out what needs to be distributed. Thus, if you ever DID have to use the else clause, I can't see how that would fail to break "make dist". On the other hand with the way we use "else" clauses they just fill empty variables which would be empty anyway. Attached patches fix this (2.1 patch applies to trunk/2.2 also). -jason
Index: utility/ftwl/Makefile.am =================================================================== --- utility/ftwl/Makefile.am (revision 14921) +++ utility/ftwl/Makefile.am (working copy) @@ -2,8 +2,6 @@ if FTWL FTWLLIB=libftwl.a -else -FTWLLIB= endif noinst_LIBRARIES = $(FTWLLIB) Index: data/Makefile.am =================================================================== --- data/Makefile.am (revision 14921) +++ data/Makefile.am (working copy) @@ -16,8 +16,6 @@ CLIENT_EXTRA_FILES = freeciv.rc-2.0 endif CLIENT_FILES = $(COMMON_CLIENT_FILES) $(CLIENT_EXTRA_FILES) -else -CLIENT_FILES = endif if SERVER @@ -25,8 +23,6 @@ civ1.serv \ civ2.serv \ default.serv -else -SERVER_FILES = endif pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) @@ -54,20 +50,14 @@ if CLIENT CLIENTDATADIRS = amplio misc flags buildings isotrident trident isophex \ hex2t stdsounds themes wonders -else -CLIENTDATADIRS = endif if SERVER SERVERDATADIRS = default civ1 civ2 scenario nation -else -SERVERDATADIRS = endif if CLIENT ICONS = freeciv-client.png -else -ICONS = endif icondir = $(prefix)/share/pixmaps Index: data/icons/Makefile.am =================================================================== --- data/icons/Makefile.am (revision 14921) +++ data/icons/Makefile.am (working copy) @@ -11,12 +11,6 @@ 64x64/freeciv-client.png icons_128_c = \ 128x128/freeciv-client.png -else -icons_16_c = -icons_32_c = -icons_48_c = -icons_64_c = -icons_128_c = endif if SERVER @@ -30,12 +24,6 @@ 64x64/freeciv-server.png icons_128_s = \ 128x128/freeciv-server.png -else -icons_16_s = -icons_32_s = -icons_48_s = -icons_64_s = -icons_128_s = endif #icons_svg = \ Index: Makefile.am =================================================================== --- Makefile.am (revision 14921) +++ Makefile.am (working copy) @@ -4,30 +4,20 @@ if CLIENT CSUBDIRS = client -else -CSUBDIRS = endif if SERVER SSUBDIRS = ai dependencies server -else -SSUBDIRS = endif if SERVER if CLIENT MSUBDIRS = manual -else -MSUBDIRS = endif -else -MSUBDIRS = endif if MAKE_DATA DSUBDIRS = data -else -DSUBDIRS = endif Index: client/Makefile.am =================================================================== --- client/Makefile.am (revision 14921) +++ client/Makefile.am (working copy) @@ -47,8 +47,6 @@ ## directory is included for 'make dist'. if MAKE_CLIENT_INCLUDE CLI_INCLUDE = include -else -CLI_INCLUDE = endif SUBDIRS = $(GUI_SUBDIR) $(CLI_INCLUDE) agents
Index: utility/ftwl/Makefile.am =================================================================== --- utility/ftwl/Makefile.am (revision 14929) +++ utility/ftwl/Makefile.am (working copy) @@ -2,8 +2,6 @@ if FTWL FTWLLIB=libftwl.a -else -FTWLLIB= endif noinst_LIBRARIES = $(FTWLLIB) Index: data/Makefile.am =================================================================== --- data/Makefile.am (revision 14929) +++ data/Makefile.am (working copy) @@ -17,8 +17,6 @@ CLIENT_EXTRA_FILES = freeciv.rc-2.0 endif CLIENT_FILES = $(COMMON_CLIENT_FILES) $(CLIENT_EXTRA_FILES) -else -CLIENT_FILES = endif if SERVER @@ -26,8 +24,6 @@ civ1.serv \ civ2.serv \ history.serv -else -SERVER_FILES = endif pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) @@ -47,14 +43,10 @@ if CLIENT CLIENTDATADIRS = misc flags isotrident trident isophex -else -CLIENTDATADIRS = endif if SERVER SERVERDATADIRS = default civ1 civ2 scenario nation history -else -SERVERDATADIRS = endif SUBDIRS = $(CLIENTDATADIRS) $(SERVERDATADIRS) Index: Makefile.am =================================================================== --- Makefile.am (revision 14929) +++ Makefile.am (working copy) @@ -2,30 +2,20 @@ if CLIENT CSUBDIRS = client -else -CSUBDIRS = endif if SERVER SSUBDIRS = ai server -else -SSUBDIRS = endif if SERVER if CLIENT MSUBDIRS = manual -else -MSUBDIRS = endif -else -MSUBDIRS = endif if MAKE_DATA DSUBDIRS = data -else -DSUBDIRS = endif Index: client/Makefile.am =================================================================== --- client/Makefile.am (revision 14929) +++ client/Makefile.am (working copy) @@ -134,8 +134,6 @@ ## directory is included for 'make dist'. if MAKE_CLIENT_INCLUDE CLI_INCLUDE = include -else -CLI_INCLUDE = endif SUBDIRS = $(GUI_SUBDIR) $(CLI_INCLUDE) agents
Index: Makefile.am =================================================================== --- Makefile.am (revision 14921) +++ Makefile.am (working copy) @@ -2,20 +2,14 @@ if CLIENT CSUBDIRS = client -else -CSUBDIRS = endif if SERVER SSUBDIRS = ai server -else -SSUBDIRS = endif if MAKE_DATA DSUBDIRS = data -else -DSUBDIRS = endif Index: client/Makefile.am =================================================================== --- client/Makefile.am (revision 14921) +++ client/Makefile.am (working copy) @@ -114,8 +114,6 @@ ## directory is included for 'make dist'. if MAKE_CLIENT_INCLUDE CLI_INCLUDE = include -else -CLI_INCLUDE = endif SUBDIRS = $(GUI_SUBDIR) $(CLI_INCLUDE) agents
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
