shithub: choc

Download patch

ref: f1f8ecdeeadab2242c80cfa442c44c9d18a6fd6e
parent: 58fee652c452dde03ab5b1a4528e713e0b97a459
parent: 4082f7caec1984713ba507a97b3c12fae2b5b9b6
author: Fabian Greffrath <fabian@greffrath.com>
date: Wed Sep 20 11:52:22 EDT 2017

Merge pull request #942 from chocolate-doom/makemake

Make "make" aware of convenience libraries in subdirectories

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,6 +168,20 @@
 $(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT)
 	cp @PROGRAM_PREFIX@setup$(EXEEXT) $@
 
+# Make "make" aware of convenience libraries in subdirectories
+
+doom/libdoom.a:
+	$(MAKE) -C doom
+
+heretic/libheretic.a:
+	$(MAKE) -C heretic
+
+hexen/libhexen.a:
+	$(MAKE) -C hexen
+
+strife/libstrife.a:
+	$(MAKE) -C strife
+
 # Source files needed for chocolate-setup:
 
 SETUP_FILES=                               \