aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Strapp <matt@mattstrapp.net>2024-10-31 16:29:29 -0500
committerMatt Strapp <matt@mattstrapp.net>2024-10-31 16:29:29 -0500
commit29cefcd5ec0734ac87b037b764d5b3786a8960c7 (patch)
treeb6eb265e55d9769e00f9f9b4abc70e68bbf5f1df
parentDebump autoconf file (diff)
downloadlocusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.tar
locusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.tar.gz
locusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.tar.bz2
locusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.tar.lz
locusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.tar.xz
locusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.tar.zst
locusts-29cefcd5ec0734ac87b037b764d5b3786a8960c7.zip
C: Small miscellaneous things
Signed-off-by: Matt Strapp <matt@mattstrapp.net>
-rw-r--r--.github/workflows/c.yml6
-rw-r--r--GNUmakefile.am2
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index 2d610ca..0d9ea06 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -8,7 +8,7 @@ on:
- "CMakeLists.txt"
- "meson.build"
- "configure.ac"
- - "GNUMakefile.am"
+ - "GNUmakefile.am"
- "ocusts.pc.in"
- ".github/workflows/c.yml"
pull_request:
@@ -18,7 +18,7 @@ on:
- "CMakeLists.txt"
- "meson.build"
- "configure.ac"
- - "GNUMakefile.am"
+ - "GNUmakefile.am"
- "ocusts.pc.in"
- ".github/workflows/c.yml"
@@ -85,7 +85,7 @@ jobs:
- name: Install dependencies
run: python -m pip install meson ninja
- name: Configure Meson
- run: meson build
+ run: meson setup build
- name: Build
run: ninja -C build
- name: Test
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 67f8910..aed5683 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -4,7 +4,7 @@ libocusts_la_SOURCES = include/locusts.h
lib_LIBRARIES = libocusts.a
libocusts_a_SOURCES = include/locusts.h
include_HEADERS = include/locusts.h
-
+ACLOCAL_AMFLAGS = -I m4
install-data-local:
mkdir -p $(libdir)/pkgconfig