From 0435c7db7ca4deb8a8174e88c52c01b39467c4de Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 24 Apr 2023 16:31:31 +0300 Subject: [PATCH 36/36] Introduce platforms/Makefile.am See osdn #47928 Signed-off-by: Marko Lindqvist --- Makefile.am | 27 ++++++++++++++++----------- configure.ac | 3 ++- platforms/.gitignore | 2 ++ platforms/Makefile.am | 13 +++++++++++++ 4 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 platforms/.gitignore create mode 100644 platforms/Makefile.am diff --git a/Makefile.am b/Makefile.am index f9ef1896e2..4ca067ab66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,22 @@ else DSUBDIRS = endif -SUBDIRS = gen_headers $(DSUBDIRS) dependencies utility common tests windows $(SSUBDIRS) client translations doc tools lua bootstrap +SUBDIRS = \ + gen_headers \ + $(DSUBDIRS) \ + dependencies \ + utility \ + common \ + tests \ + windows \ + platforms \ + $(SSUBDIRS) \ + client \ + translations \ + doc \ + tools \ + lua \ + bootstrap docs = \ ABOUT-NLS \ @@ -84,16 +99,6 @@ EXTRA_DIST = autogen.sh \ m4/testmatic.m4 \ meson.build \ meson_options.txt \ - platforms/emscripten/emsbuild.sh \ - platforms/emscripten/setups/cross-ems.tmpl \ - platforms/flatpak/build_flatpak.sh \ - platforms/flatpak/org.freeciv.gtk322.yml \ - platforms/flatpak/org.freeciv.gtk4.yml \ - platforms/flatpak/org.freeciv.mp.gtk3.yml \ - platforms/flatpak/org.freeciv.mp.gtk4.yml \ - platforms/flatpak/org.freeciv.qt.yml \ - platforms/flatpak/org.freeciv.sdl2.yml \ - platforms/macos/homebrew-appbundle.sh \ scripts/mapimg2anim \ scripts/setup_auth_server.sh \ scripts/replace \ diff --git a/configure.ac b/configure.ac index c971e39b42..50689b3eee 100644 --- a/configure.ac +++ b/configure.ac @@ -1969,7 +1969,8 @@ AC_CONFIG_FILES([Makefile ai/stub/Makefile ai/tex/Makefile tests/Makefile - windows/Makefile + platforms/Makefile + windows/Makefile client/Makefile client/agents/Makefile client/include/Makefile diff --git a/platforms/.gitignore b/platforms/.gitignore new file mode 100644 index 0000000000..9ee6454019 --- /dev/null +++ b/platforms/.gitignore @@ -0,0 +1,2 @@ +/Makefile.in +/Makefile diff --git a/platforms/Makefile.am b/platforms/Makefile.am new file mode 100644 index 0000000000..f9a7b80b4f --- /dev/null +++ b/platforms/Makefile.am @@ -0,0 +1,13 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = \ + emscripten/emsbuild.sh \ + emscripten/setups/cross-ems.tmpl \ + flatpak/build_flatpak.sh \ + flatpak/org.freeciv.gtk322.yml \ + flatpak/org.freeciv.gtk4.yml \ + flatpak/org.freeciv.mp.gtk3.yml \ + flatpak/org.freeciv.mp.gtk4.yml \ + flatpak/org.freeciv.qt.yml \ + flatpak/org.freeciv.sdl2.yml \ + macos/homebrew-appbundle.sh -- 2.39.2