foxygit / doom Log in
commit 4082f7caec1984713ba507a97b3c12fae2b5b9b6
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Wed Sep 20 10:26:48 2017 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Wed Sep 20 10:26:48 2017 +0200

    Make "make" aware of convenience libraries in subdirectories

    This may not be the most sophisticated solution (i.e. I would have
    preferred to use wildcards in the target rules), but it should be
    good enough to fix #938.
---
 src/Makefile.am | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b9f8dd9..e3bc7bb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,6 +168,20 @@ endif
 $(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=                               \