From d308c5ccb117f7fd6cb7e6f8ac651b0b99a99817 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 20 Apr 2020 10:33:09 -0400 Subject: Use . as ${LDLIBS.$@} separator --- Makefile | 12 ++++++------ configure | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c2aacd3..96bd125 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ETCDIR = ${PREFIX}/etc CFLAGS += -std=c11 -Wall -Wextra -Wpedantic LDLIBS = -lsqlite3 -LDLIBS_litterbox = -ltls +LDLIBS.litterbox = -ltls BINS = litterbox scoop unscoop MANS = ${BINS:=.1} @@ -13,17 +13,17 @@ RCS = -include config.mk FORMATS = generic catgirl irc textual -OBJS_litterbox = litterbox.o config.o +OBJS.litterbox = litterbox.o config.o dev: tags all test all: ${BINS} -litterbox: ${OBJS_litterbox} - ${CC} ${LDFLAGS} ${OBJS_$@} ${LDLIBS} ${LDLIBS_$@} -o $@ +litterbox: ${OBJS.litterbox} + ${CC} ${LDFLAGS} ${OBJS.$@} ${LDLIBS} ${LDLIBS.$@} -o $@ .o: - ${CC} ${LDFLAGS} $< ${LDLIBS} ${LDLIBS_$@} -o $@ + ${CC} ${LDFLAGS} $< ${LDLIBS} ${LDLIBS.$@} -o $@ ${BINS:=.o}: database.h @@ -37,7 +37,7 @@ tags: *.c *.h ctags -w *.c *.h clean: - rm -f .test tags ${BINS} ${OBJS_litterbox} ${BINS:=.o} + rm -f .test tags ${BINS} ${OBJS.litterbox} ${BINS:=.o} install: ${BINS} ${MANS} install -d ${PREFIX}/bin ${MANDIR}/man1 diff --git a/configure b/configure index 0cd0bf5..5e442ba 100755 --- a/configure +++ b/configure @@ -31,5 +31,5 @@ CFLAGS += $(pkg-config --cflags $libs) CFLAGS += -D'SQLITE3_BIN="$(pkg-config --variable=prefix sqlite3)/bin/sqlite3"' LDFLAGS += $(pkg-config --libs-only-L $libs) LDLIBS = $(pkg-config --libs-only-l sqlite3) -LDLIBS_litterbox = $(pkg-config --libs-only-l libtls) +LDLIBS.litterbox = $(pkg-config --libs-only-l libtls) EOF -- cgit 1.4.1