From ac0a0e19b9005bcbad696f836830ffa99a14cab9 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Wed, 28 Aug 2019 17:21:32 -0400 Subject: Remove brot and gfxx --- bin/Makefile | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'bin/Makefile') diff --git a/bin/Makefile b/bin/Makefile index bf096907..de4fda51 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,21 +1,14 @@ -GFX = cocoa -LIBRESSL_PREFIX = /usr/local - PREFIX = ~/.local MANDIR = ${PREFIX}/share/man CFLAGS += -Wall -Wextra -Wpedantic LDLIBS = -lm -lutil -lz +LIBRESSL_PREFIX = /usr/local CFLAGS_tls = ${CFLAGS} -I${LIBRESSL_PREFIX}/include LDFLAGS_tls = ${LDFLAGS} -L${LIBRESSL_PREFIX}/lib LDLIBS_tls = ${LDLIBS} -ltls -GFX_OBJ = gfx-${GFX}.o -LDLIBS_cocoa = ${LDLIBS} -framework Cocoa -LDLIBS_fb = ${LDLIBS} -LDLIBS_x11 = ${LDLIBS} -lX11 - -include config.mk BINS_ANY += aes @@ -45,9 +38,6 @@ LINKS_ANY += pbpaste BINS_BSD += wat -BINS_GFX += brot -BINS_GFX += gfxx - BINS_LINUX += bri BINS_LINUX += fbatt BINS_LINUX += fbclock @@ -55,7 +45,7 @@ BINS_LINUX += psfed BINS_TLS += relay -BINS = ${BINS_ANY} ${BINS_BSD} ${BINS_GFX} ${BINS_LINUX} ${BINS_TLS} +BINS = ${BINS_ANY} ${BINS_BSD} ${BINS_LINUX} ${BINS_TLS} MANS = ${BINS:%=man1/%.1} LINKS = ${LINKS_ANY} @@ -65,8 +55,6 @@ any: meta ${BINS_ANY} ${LINKS_ANY} bsd: meta ${BINS_BSD} -gfx: meta ${BINS_GFX} - linux: meta ${BINS_LINUX} tls: meta ${BINS_TLS} @@ -75,12 +63,6 @@ meta: tags .gitignore # Binaries -brot: brot.o ${GFX_OBJ} - ${CC} ${LDFLAGS} $@.o ${GFX_OBJ} ${LDLIBS_${GFX}} -o $@ - -gfxx: gfxx.o ${GFX_OBJ} - ${CC} ${LDFLAGS} $@.o ${GFX_OBJ} ${LDLIBS_${GFX}} -o $@ - hi: hi.c ${CC} ${CFLAGS} ${LDFLAGS} hi.c ${LDLIBS} -o $@ ./hi -c @@ -93,11 +75,9 @@ relay: relay.c # Headers -brot.o gfxx.o gfx-cocoa.o gfx-fb.o gfx-x11.o: gfx.h - fbatt.o fbclock.o: scheme.h -gfxx.o psf2png.o scheme.o: png.h +psf2png.o scheme.o: png.h scheme.h: scheme ./scheme -c > scheme.h -- cgit 1.4.1