commit 8e2fa9daffbe713eb725e366d4c275951b146d97
parent 740e1c6e8ebfb606906695edd6906aff23c623d1
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 29 Jul 2026 22:30:23 +0200
fix meson build issues
Diffstat:
4 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/doc/doxygen/Makefile b/doc/doxygen/Makefile
@@ -0,0 +1,33 @@
+# This file is in the public domain
+#
+# Hand-written makefile: this used to be a Makefile.am processed by automake,
+# but the build was migrated to Meson. It is invoked by
+# scripts/doxygen.meson.sh (the 'doxygen' run_target), and can also be run
+# directly from this directory.
+#
+# PROJECT_NUMBER is appended to the config so the version does not have to be
+# kept up to date by hand in anastasis.doxy.
+
+DOXYFILE = anastasis.doxy
+# get_version.sh looks for ./.version and ./.git, so it must run from the
+# top of the source tree.
+PACKAGE_VERSION ?= $(shell cd ../.. && ./scripts/get_version.sh)
+
+.PHONY: all full fast clean help
+
+all: full
+
+help:
+ @echo "Generate documentation:"
+ @echo " make full - full documentation with dependency graphs (slow)"
+ @echo " make fast - fast mode without dependency graphs"
+
+full: $(DOXYFILE)
+ { cat $(DOXYFILE); echo "PROJECT_NUMBER = $(PACKAGE_VERSION)"; } | doxygen -
+
+fast: $(DOXYFILE)
+ { sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $(DOXYFILE); \
+ echo "PROJECT_NUMBER = $(PACKAGE_VERSION)"; } | doxygen -
+
+clean:
+ rm -rf html version.doxy
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
@@ -1,15 +0,0 @@
-# This Makefile.am is in the public domain
-all:
- @echo -e \
-"Generate documentation:\n" \
-"\tmake full - full documentation with dependency graphs (slow)\n" \
-"\tmake fast - fast mode without dependency graphs"
-
-full: gnunet.doxy
- doxygen $<
-
-fast: gnunet.doxy
- sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen -
-
-clean:
- rm -rf html
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
@@ -1,3 +0,0 @@
-# This Makefile.am is in the public domain
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = icon-theme-installer
diff --git a/po/meson.build b/po/meson.build
@@ -0,0 +1,10 @@
+# This file is in the public domain
+#
+# Builds anastasis-gtk.pot from po/POTFILES.in (regenerate that list with
+# contrib/pogen.sh) and installs a .mo per language listed in po/LINGUAS.
+# The 'glib' preset supplies the usual xgettext keywords (_, N_, C_, ...).
+i18n.gettext(
+ gettext_package,
+ preset: 'glib',
+ install: true,
+)