summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 12 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 073f0be..90e71e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
 CFLAGS += -std=c99 -Wall -Wextra -Wpedantic
+CFLAGS += -Icards
 
 include config.mk
 
-BINS = dump freecell sol
+BINS = freecell sol
+OBJS = ${BINS:%=%.o}
 
-all: $(BINS)
+all: ${BINS}
 
-$(BINS): cards.o
+${BINS}: cards/cards.o
 
 .o:
-	$(CC) $(LDFLAGS) $< cards.o $(LDLIBS) -o $@
+	${CC} ${LDFLAGS} $< cards/cards.o ${LDLIBS} -o $@
 
-cards.o dump.o freecell.o sol.o: cards.h
+${OBJS} cards/cards.o: cards/cards.h
 
-freecell.o sol.o: asset.h layout.h stack.h
+${OBJS}: asset.h layout.h stack.h
+
+cards/cards.h:
+	git submodule update --init
 
 clean:
-	rm -f $(BINS) *.o *.bmp
+	rm -f ${BINS} *.o cards/*.o
r> Fixes mistaken highlight of: pngWrite(file, (uint8_t []) { 0, 0, 0 }, 3); 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe