From 9151f9358b2aad7180444809ff738bc31e5ed834 Mon Sep 17 00:00:00 2001 From: speedie Date: Sun, 4 Dec 2022 21:46:48 +0100 Subject: [PATCH] rework makefile and toggle a little --- Makefile | 7 +++++-- toggle.mk | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b291de8..906d41d 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,12 @@ include toggle.mk SRC = draw.c speedwm.c main.c OBJ = ${SRC:.c=.o} -ifdef USEIPC +# ipc +ifdef YAJLLIBS IPC=speedwm-ipc endif + +# status ifdef USESTATUS STATUS=status endif @@ -40,7 +43,7 @@ status.o: status.c status.h $(CC) -c status.c endif -ifdef USEIPC +ifdef YAJLLIBS speedwm-ipc: toggle/ipc-speedwm-msg.o ${CC} -o $@ toggle/ipc-speedwm-msg.c ${LDFLAGS} ; rm -f ipc-speedwm-msg.o endif diff --git a/toggle.mk b/toggle.mk index d8e0f0a..d744fdd 100644 --- a/toggle.mk +++ b/toggle.mk @@ -5,9 +5,8 @@ # IPC # Whether or not to compile in IPC support. # If you use OpenBSD or FreeBSD, this is not supported. In that case comment out these three lines and set USEIPC in toggle.h to 0. -USEIPC = true # Comment if you don't use IPC -YAJLLIBS = -lyajl # Comment if you don't use IPC YAJLINC = /usr/include/yajl # Comment if you don't use IPC +YAJLLIBS = -lyajl # Comment if you don't use IPC # Built in status # Whether or not to compile the built in status bar (fork of dwmblocks).