From: Andre Noll <maan@tuebingen.mpg.de>
Date: Tue, 20 May 2025 19:33:04 +0000 (+0200)
Subject: Merge topic branch t/build into master
X-Git-Url: https://git.tuebingen.mpg.de/?a=commitdiff_plain;h=82651853811d4743467a71c0f6dca7492a6157ec;p=paraslash.git

Merge topic branch t/build into master

A medium sized series for the build system which improves the way the git
version string is stored in the executables and man pages. Subsequent patches
of the series remove some warts from the makefile: we no longer use order-only
dependencies and the .PRECIOUS target.

The merge results in a conflict against the "remove regex include" commit
67388cd4fae0. This is trivial to resolve, though.

* refs/heads/t/build:
  Doxify version functions.
  Doxify OV_EXCLUDE_STATIC_CALLBACKS #define.
  Makefile: Fix braino in tarball target.
  build: Remove superfluous dependency in Makefile.real.
  build: Remove the .PRECIOUS target.
  build: Improve clean targets.
  build: Get rid of directory order-only dependencies.
  build: Compile with -Wunused -Wall also on BSD.
  build: Revamp git versioning.
  build: Merge version.{c,h} into string.{c,h}.
---

82651853811d4743467a71c0f6dca7492a6157ec
diff --cc NEWS.md
index 1ed27260,1ed27260..daec9b6a
--- a/NEWS.md
+++ b/NEWS.md
@@@ -2,9 -2,9 +2,12 @@@ NEW
  ====
  
  ------------------------------------------
--?.?.? (to be announced) "pulsating plasma"
++0.7.5 (to be announced) "pulsating plasma"
  ------------------------------------------
  
++- A bunch of build system improvements and cleanups.
++
++
  [tarball](./releases/paraslash-git.tar.xz)
  
  ----------------------------------------
diff --cc oggdec_filter.c
index e7f0f370,7d9feda9..c0a13af9
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@@ -2,6 -2,17 +2,17 @@@
  
  /** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */
  
 -#include <regex.h>
+ 
+ /**
+  * Avoid warnings on NetBSD.
+  *
+  * The static ogg-vorbis callback structures are only needed on Windows. At
+  * least with vorbistools-1.3.7, they cause warnings on NetBSD-10.0. The define
+  * below instructs the preprocessor to not define these structures, avoiding
+  * the warnings. See the comment in vorbisfile.h for details.
+  */
+ #define OV_EXCLUDE_STATIC_CALLBACKS
++
  #include <vorbis/vorbisfile.h>
  
  #include "para.h"