From 7f3b17bd263ac512e59354a33c43fd3b225ecc6d Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 20 Aug 2015 01:37:52 -0400
Subject: use the libvt100 library

---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 110ca62..bbccdad 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,6 @@ SRC      = src/
 OBJ      = $(BUILD)runes.o \
 	   $(BUILD)display.o \
 	   $(BUILD)term.o \
-	   $(BUILD)parser.o \
-	   $(BUILD)screen.o \
 	   $(BUILD)config.o \
 	   $(BUILD)window-xlib.o \
 	   $(BUILD)pty-unix.o \
@@ -14,16 +12,19 @@ LIBS     = cairo cairo-xlib libuv pangocairo
 CFLAGS  ?= -g -Wall -Wextra -Werror
 LDFLAGS ?= -g -Wall -Wextra -Werror
 
-ALLCFLAGS  = $(shell pkg-config --cflags $(LIBS)) $(CFLAGS)
-ALLLDFLAGS = $(shell pkg-config --libs $(LIBS)) $(LDFLAGS)
+ALLCFLAGS  = $(shell pkg-config --cflags $(LIBS)) -Ilibvt100/src $(CFLAGS)
+ALLLDFLAGS = $(shell pkg-config --libs $(LIBS)) -Llibvt100 -lvt100 $(LDFLAGS)
 
 MAKEDEPEND = $(CC) $(ALLCFLAGS) -M -MP -MT '$@ $(@:$(BUILD)%.o=$(BUILD).%.d)'
 
 build: $(OUT)
 
-$(OUT): $(OBJ)
+$(OUT): $(OBJ) libvt100/libvt100.so
 	$(CC) $(ALLLDFLAGS) -o $@ $^
 
+libvt100/libvt100.so:
+	cd libvt100 && make
+
 $(BUILD)%.o: $(SRC)%.c
 	@mkdir -p $(BUILD)
 	@$(MAKEDEPEND) -o $(<:$(SRC)%.c=$(BUILD).%.d) $<
@@ -38,6 +39,7 @@ $(SRC)%.h: $(SRC)%.l
 	$(LEX) --header-file=$(<:.l=.h) -o /dev/null $<
 
 clean:
+	cd libvt100 && make clean
 	rm -f $(OUT) $(OBJ) $(OBJ:$(BUILD)%.o=$(BUILD).%.d)
 	@rmdir -p $(BUILD) > /dev/null 2>&1
 
-- 
cgit v1.2.3-54-g00ecf