From dff43eaca606dc761d729e9a35885c126ce7d966 Mon Sep 17 00:00:00 2001 From: liquidaty Date: Thu, 1 Aug 2024 13:51:49 -0700 Subject: [PATCH] add ZSV_EXTRAS definition to zsv.h (#183) --- include/{zsv.h => zsv.h.in} | 2 ++ src/Makefile | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) rename include/{zsv.h => zsv.h.in} (92%) diff --git a/include/zsv.h b/include/zsv.h.in similarity index 92% rename from include/zsv.h rename to include/zsv.h.in index 278de896..c256b636 100644 --- a/include/zsv.h +++ b/include/zsv.h.in @@ -9,6 +9,8 @@ #ifndef ZSV_H #define ZSV_H +__ZSV_EXTRAS__DEFINE__ + #include #include "zsv/common.h" #include "zsv/api.h" diff --git a/src/Makefile b/src/Makefile index 828caddd..48df76f6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -121,7 +121,7 @@ help: @echo " [CONFIGFILE=config.mk] [NO_UTF8_CHECK=1] [VERBOSE=1] [LIBDIR=${LIBDIR}] [INCLUDEDIR=${INCLUDEDIR}] [LIB_SUFFIX=]" @echo -build: ${LIBZSV} +build: ../include/zsv.h ${LIBZSV} ${LIBZSV}: ${ZSV_OBJ} @mkdir -p `dirname "$@"` @@ -131,9 +131,17 @@ ${LIBZSV}: ${ZSV_OBJ} $(AR) -t $@ # check it is there @echo Built $@ -install: ${LIBZSV_INSTALL} +../include/zsv.h: +ifeq ($(ZSV_EXTRAS),1) + @sed 's/__ZSV_EXTRAS__DEFINE__/#ifndef ZSV_EXTRAS\n#define ZSV_EXTRAS\n#endif/' < ../include/zsv.h.in > $@ +else + @sed 's/__ZSV_EXTRAS__DEFINE__//' < ../include/zsv.h.in > $@ +endif + +install: ../include/zsv.h ${LIBZSV_INSTALL} @mkdir -p $(INCLUDEDIR) - @cp -pR ../include/* $(INCLUDEDIR) + @cp -p ../include/*.h $(INCLUDEDIR) + @cp -pR ../include/zsv $(INCLUDEDIR)/ @echo "include files copied to $(INCLUDEDIR)" ${LIBZSV_INSTALL}: ${LIBZSV} @@ -147,6 +155,7 @@ uninstall: clean: rm -rf ${BUILD_DIR}/objs ${LIBZSV} + rm -f ../include/zsv.h .PHONY: build install uninstall clean ${LIBZSV_INSTALL}