From 8b4a0f86cf6bfffc2cb88f8a1605c90fb73c60e9 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 18 Jul 2023 12:38:03 +1200 Subject: [PATCH] Remove hard dependency on readline, split makefile config into config.mk --- Makefile | 5 +---- config.mk | 8 ++++++++ shell.nix | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 config.mk diff --git a/Makefile b/Makefile index a9eb9ce..7c93b96 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,6 @@ PREFIX = /usr/local -CC = cc -CFLAGS = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -I. -Ilua-5.4 -CPPFLAGS = -D_DEFAULT_SOURCE -DLUA_USE_READLINE -LDFLAGS = -lm -lreadline +include config.mk OBJS = csto.o lcallisto.o lcl.o lenviron.o lextra.o lfile.o \ ljson.o lprocess.o lsocket.o util.o diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..9c6776c --- /dev/null +++ b/config.mk @@ -0,0 +1,8 @@ +CC = cc +CFLAGS = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -I. -Ilua-5.4 +CPPFLAGS = -D_DEFAULT_SOURCE +LDFLAGS = -lm + +# Enable readline +#CPPFLAGS += -DLUA_USE_READLINE +#LDFLAGS += -lreadline diff --git a/shell.nix b/shell.nix index 3892b0e..8ab016a 100644 --- a/shell.nix +++ b/shell.nix @@ -3,7 +3,6 @@ pkgs.mkShell { nativeBuildInputs = with pkgs.buildPackages; [ bmake clang - readline ]; shellHook = "alias make=bmake"; }