diff --git a/CHANGELOG.md b/CHANGELOG.md index bfdf611c..aab4c45b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog All notable changes to this project will be documented in this file. +## Unreleased - ??? +- Support config.mk for more easily configuring the Makefile. + ## 1.25.0 - 2022-10-10 - Windows FFI fixes. - Fix PEG `if-not` combinator with captures in the condition diff --git a/Makefile b/Makefile index 8079a98b..02bd3c22 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ sinclude config.mk PREFIX?=/usr/local +JANETCONF_HEADER?=src/conf/janetconf.h INCLUDEDIR?=$(PREFIX)/include BINDIR?=$(PREFIX)/bin LIBDIR?=$(PREFIX)/lib @@ -83,7 +84,7 @@ all: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STATIC_LIBRARY) build/janet.h ##### Name Files ##### ###################### -JANET_HEADERS=src/include/janet.h src/conf/janetconf.h +JANET_HEADERS=src/include/janet.h $(JANETCONF_HEADER) JANET_LOCAL_HEADERS=src/core/features.h \ src/core/util.h \ @@ -176,16 +177,16 @@ endif build/c/shell.c: src/mainclient/shell.c cp $< $@ -build/janet.h: $(JANET_TARGET) src/include/janet.h src/conf/janetconf.h - ./$(JANET_TARGET) tools/patch-header.janet src/include/janet.h src/conf/janetconf.h $@ +build/janet.h: $(JANET_TARGET) src/include/janet.h $(JANETCONF_HEADER) + ./$(JANET_TARGET) tools/patch-header.janet src/include/janet.h $(JANETCONF_HEADER) $@ -build/janetconf.h: src/conf/janetconf.h +build/janetconf.h: $(JANETCONF_HEADER) cp $< $@ -build/janet.o: build/c/janet.c src/conf/janetconf.h src/include/janet.h +build/janet.o: build/c/janet.c $(JANETCONF_HEADER) src/include/janet.h $(HOSTCC) $(BUILD_CFLAGS) -c $< -o $@ -build/shell.o: build/c/shell.c src/conf/janetconf.h src/include/janet.h +build/shell.o: build/c/shell.c $(JANETCONF_HEADER) src/include/janet.h $(HOSTCC) $(BUILD_CFLAGS) -c $< -o $@ $(JANET_TARGET): build/janet.o build/shell.o diff --git a/meson.build b/meson.build index 1567f3d9..9a7f9b2b 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.25.0') + version : '1.25.1') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index f1c57962..78afab4b 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -5,9 +5,9 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 25 -#define JANET_VERSION_PATCH 0 -#define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.25.0" +#define JANET_VERSION_PATCH 1 +#define JANET_VERSION_EXTRA "-dev" +#define JANET_VERSION "1.25.1-dev" /* #define JANET_BUILD "local" */