From 3859c8d205581ee7238552af6bab05bda17f70e4 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 14 May 2016 22:08:18 -0400 Subject: remove some duplication in the makefile --- Makefile | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index b0e4eaa..99e139e 100644 --- a/Makefile +++ b/Makefile @@ -3,31 +3,27 @@ DOUT = runesd COUT = runesc BUILD = build/ SRC = src/ -OBJ = $(BUILD)runes.o \ - $(BUILD)display.o \ +BASE_OBJ = $(BUILD)util.o +TERM_OBJ = $(BUILD)display.o \ $(BUILD)term.o \ $(BUILD)config.o \ $(BUILD)window-xlib.o \ $(BUILD)window-backend-xlib.o \ $(BUILD)pty-unix.o \ - $(BUILD)loop.o \ - $(BUILD)util.o + $(BUILD)loop.o +SOCK_OBJ = $(BUILD)socket.o \ + $(BUILD)protocol.o +OBJ = $(BUILD)runes.o \ + $(BASE_OBJ) \ + $(TERM_OBJ) DOBJ = $(BUILD)runesd.o \ - $(BUILD)display.o \ - $(BUILD)term.o \ - $(BUILD)config.o \ - $(BUILD)window-xlib.o \ - $(BUILD)window-backend-xlib.o \ - $(BUILD)pty-unix.o \ - $(BUILD)loop.o \ - $(BUILD)util.o \ $(BUILD)daemon.o \ - $(BUILD)socket.o \ - $(BUILD)protocol.o + $(BASE_OBJ) \ + $(TERM_OBJ) \ + $(SOCK_OBJ) COBJ = $(BUILD)runesc.o \ - $(BUILD)util.o \ - $(BUILD)socket.o \ - $(BUILD)protocol.o + $(BASE_OBJ) \ + $(SOCK_OBJ) LIBS = cairo cairo-xlib libevent pangocairo OPT ?= -g CFLAGS ?= $(OPT) -Wall -Wextra -Werror -- cgit v1.2.3-54-g00ecf