From a513d9943fb71607ac8c0f2f3695dec9706f1ebb Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 2 May 2016 04:21:26 -0400 Subject: start working on a client/server model similar to urxvtd/urxvtc the code is still kind of a mess, and it doesn't quite work properly yet, but it's close enough to be a start, i think --- Makefile | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 271e681..fe7f69d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ OUT = runes +DOUT = runesd +COUT = runesc BUILD = build/ SRC = src/ OBJ = $(BUILD)runes.o \ @@ -9,6 +11,17 @@ OBJ = $(BUILD)runes.o \ $(BUILD)pty-unix.o \ $(BUILD)loop.o \ $(BUILD)util.o +DOBJ = $(BUILD)runesd.o \ + $(BUILD)display.o \ + $(BUILD)term.o \ + $(BUILD)config.o \ + $(BUILD)window-xlib.o \ + $(BUILD)pty-unix.o \ + $(BUILD)loop.o \ + $(BUILD)util.o \ + $(BUILD)socket.o +COBJ = $(BUILD)runesc.o \ + $(BUILD)util.o LIBS = cairo cairo-xlib libuv pangocairo CFLAGS ?= -g -Wall -Wextra -Werror LDFLAGS ?= -g -Wall -Wextra -Werror @@ -18,11 +31,17 @@ ALLLDFLAGS = $(shell pkg-config --libs $(LIBS)) $(LDFLAGS) MAKEDEPEND = $(CC) $(ALLCFLAGS) -M -MP -MT '$@ $(@:$(BUILD)%.o=$(BUILD).%.d)' -build: $(OUT) +build: $(OUT) $(DOUT) $(COUT) $(OUT): $(OBJ) libvt100/libvt100.a $(CC) $(ALLLDFLAGS) -o $@ $^ +$(DOUT): $(DOBJ) libvt100/libvt100.a + $(CC) $(ALLLDFLAGS) -o $@ $^ + +$(COUT): $(COBJ) + $(CC) $(ALLLDFLAGS) -o $@ $^ + libvt100/libvt100.a: cd libvt100 && make static @@ -41,7 +60,7 @@ $(SRC)%.h: $(SRC)%.l clean: cd libvt100 && make clean - rm -f $(OUT) $(OBJ) $(OBJ:$(BUILD)%.o=$(BUILD).%.d) + rm -f $(OUT) $(OBJ) $(OBJ:$(BUILD)%.o=$(BUILD).%.d) $(DOUT) $(DOBJ) $(DOBJ:$(BUILD)%.o=$(BUILD).%.d) $(COUT) $(COBJ) $(COBJ:$(BUILD)%.o=$(BUILD).%.d) @rmdir -p $(BUILD) > /dev/null 2>&1 -include $(OBJ:$(BUILD)%.o=$(BUILD).%.d) -- cgit v1.2.3-54-g00ecf