From de7b0d4d13e046c7ef2689f3b734874c27b2bd95 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 16 Jul 2023 09:17:58 +0300 Subject: [PATCH 18/18] Move freeciv-manual sources to new subdirectory manual/ See osdn #48384 Signed-off-by: Marko Lindqvist --- configure.ac | 1 + meson.build | 2 +- tools/Makefile.am | 25 +++---------------- tools/manual/Makefile.am | 30 +++++++++++++++++++++++ tools/{civmanual.c => manual/fc_manual.c} | 0 5 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 tools/manual/Makefile.am rename tools/{civmanual.c => manual/fc_manual.c} (100%) diff --git a/configure.ac b/configure.ac index 858518e4f7..b558d80199 100644 --- a/configure.ac +++ b/configure.ac @@ -1978,6 +1978,7 @@ AC_CONFIG_FILES([Makefile server/scripting/Makefile tools/Makefile tools/fcmp/Makefile + tools/manual/Makefile tools/ruledit/Makefile tools/ruleutil/Makefile tools/shared/Makefile diff --git a/meson.build b/meson.build index e47fb0d1fe..f160b43f4a 100644 --- a/meson.build +++ b/meson.build @@ -4091,7 +4091,7 @@ custom_target('mi_ruledit', endif executable('freeciv-manual', - 'tools/civmanual.c', + 'tools/manual/fc_manual.c', 'client/helpdata.c', link_with: [common_lib, server_lib, tool_lib, ais], include_directories: [tool_inc, diff --git a/tools/Makefile.am b/tools/Makefile.am index 3e011cbd3b..634f8a949d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,6 +6,10 @@ if RULEDIT SUBDIRS += ruledit endif +if FCMANUAL +SUBDIRS += manual +endif + include $(top_srcdir)/bootstrap/Makerules.mk bin_PROGRAMS = @@ -14,10 +18,6 @@ if FCRULEUP bin_PROGRAMS += freeciv-ruleup endif -if FCMANUAL -bin_PROGRAMS += freeciv-manual -endif - common_cppflags = \ -I$(top_srcdir)/dependencies/cvercmp \ -I$(top_srcdir)/utility \ @@ -25,8 +25,6 @@ common_cppflags = \ -I$(top_srcdir)/common/aicore \ -I$(top_srcdir)/common/networking \ -I$(top_srcdir)/server \ - -I$(top_srcdir)/client \ - -I$(top_srcdir)/client/include \ -I$(top_srcdir)/tools/ruleutil \ -I$(top_srcdir)/tools/shared \ -I$(top_srcdir)/dependencies/tinycthread @@ -42,18 +40,3 @@ freeciv_ruleup_LDADD = \ $(top_builddir)/tools/ruleutil/libfcruleutil.la \ $(top_builddir)/tools/shared/libtoolsshared.la \ $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) $(SERVER_LIBS) - -if FCMANUAL -freeciv_manual_SOURCES = \ - civmanual.c - -# This is a bit of a hack. The program links in with the server lib -# but also uses some files from the client. -freeciv_manual_LDADD = \ - $(top_builddir)/server/libfreeciv-srv.la \ - $(top_builddir)/client/libfc_helpdata.la \ - $(top_builddir)/common/libfreeciv.la \ - $(top_builddir)/tools/shared/libtoolsshared.la \ - $(INTLLIBS) $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \ - $(SERVER_LIBS) -endif diff --git a/tools/manual/Makefile.am b/tools/manual/Makefile.am new file mode 100644 index 0000000000..6dbf21d648 --- /dev/null +++ b/tools/manual/Makefile.am @@ -0,0 +1,30 @@ +## Process this file with automake to produce Makefile.in + +bin_PROGRAMS = freeciv-manual + +common_cppflags = \ + -I$(top_srcdir)/dependencies/cvercmp \ + -I$(top_srcdir)/utility \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/common/aicore \ + -I$(top_srcdir)/common/networking \ + -I$(top_srcdir)/server \ + -I$(top_srcdir)/client \ + -I$(top_srcdir)/client/include \ + -I$(top_srcdir)/tools/shared \ + -I$(top_srcdir)/dependencies/tinycthread + +AM_CPPFLAGS = $(common_cppflags) + +freeciv_manual_SOURCES = \ + fc_manual.c + +# This is a bit of a hack. The program links in with the server lib +# but also uses some files from the client. +freeciv_manual_LDADD = \ + $(top_builddir)/server/libfreeciv-srv.la \ + $(top_builddir)/client/libfc_helpdata.la \ + $(top_builddir)/common/libfreeciv.la \ + $(top_builddir)/tools/shared/libtoolsshared.la \ + $(INTLLIBS) $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \ + $(SERVER_LIBS) diff --git a/tools/civmanual.c b/tools/manual/fc_manual.c similarity index 100% rename from tools/civmanual.c rename to tools/manual/fc_manual.c -- 2.40.1