summary refs log tree commit diff
path: root/bin/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2018-02-09 15:21:47 -0500
committerJune McEnroe <programble@gmail.com>2018-02-09 15:21:47 -0500
commita3c622a5ab8bf2cf0cde6b09ab882f4209ca8f5e (patch)
tree8066976a3eebba31cec78a36301cfe0582a07f5c /bin/Makefile
parentMove gfx frontends around to simplify build (diff)
downloadsrc-a3c622a5ab8bf2cf0cde6b09ab882f4209ca8f5e.tar.gz
src-a3c622a5ab8bf2cf0cde6b09ab882f4209ca8f5e.zip
Link LDLIBS regardless of GFX
Diffstat (limited to '')
-rw-r--r--bin/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 2a4658f1..c55b42e9 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -6,8 +6,8 @@ GFX = none
 
 CFLAGS += -Wall -Wextra -Wpedantic
 LDLIBS = -lcurses -ledit -lutil -lz
-LDLIBS_cocoa = $(LDLIBS) -framework Cocoa
-LDLIBS_x11 = $(LDLIBS) -lX11
+LDLIBS_cocoa = -framework Cocoa
+LDLIBS_x11 = -lX11
 
 any: .gitignore tags $(ANY_BINS)
 
@@ -19,7 +19,7 @@ atch: dtch
 	ln -f dtch atch
 
 gfxx: gfxx.o gfx/$(GFX).o
-	$(CC) $(LDFLAGS) gfxx.o gfx/$(GFX).o $(LDLIBS_$(GFX)) -o $@
+	$(CC) $(LDFLAGS) gfxx.o gfx/$(GFX).o $(LDLIBS) $(LDLIBS_$(GFX)) -o $@
 
 pbcopy pbpaste: pbd
 	ln -f pbd $@
ref='/cgit-pink/commit/ui-tree.c?h=1.3.0&id=985fba80d06f37fdba5e72d738ce21ab5ab5a76d&follow=1'>git: update to v2.21.0Christian Hesse 2019-06-05ui-ssdiff: ban strncat()Christian Hesse 2019-06-05global: make 'char *path' const where possibleChristian Hesse 2019-05-20ui-shared: restrict to 15 levelsJason A. Donenfeld 2019-02-23ui-diff,ui-tag: don't use htmlf with non-formatted stringsChris Mayo 2019-02-23ui-ssdiff: resolve HTML5 validation errorsChris Mayo 2019-01-03filters: migrate from luacrypto to luaosslJason A. Donenfeld 2019-01-02ui-shared: fix broken sizeof in title setting and rewriteJason A. Donenfeld 2018-12-09git: update to v2.20.0Christian Hesse 2018-11-25ui-blame: set repo for sbJason A. Donenfeld 2018-11-25auth-filter: pass url with query string attachedJason A. Donenfeld 2018-11-21git: use xz compressed archive for downloadChristian Hesse 2018-10-12git: update to v2.19.1Christian Hesse 2018-09-11ui-ssdiff: ban strcat()Christian Hesse 2018-09-11ui-ssdiff: ban strncpy()Christian Hesse 2018-09-11ui-shared: ban strcat()Christian Hesse 2018-09-11ui-patch: ban sprintf()Christian Hesse 2018-09-11ui-log: ban strncpy()Christian Hesse 2018-09-11ui-log: ban strcpy()Christian Hesse 2018-09-11parsing: ban sprintf()Christian Hesse 2018-09-11parsing: ban strncpy()Christian Hesse 2018-08-28filters: generate anchor links from markdownChristian Hesse 2018-08-03Bump version.Jason A. Donenfeld 2018-08-03clone: fix directory traversalJason A. Donenfeld 2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev