#5361: Makefile adjustments

codereader · Oct 19, 2020 · dfe49ed · dfe49ed
1 parent 6bb4708
commit dfe49ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libs radiantcore radiant plugins install/i18n doc #test
+SUBDIRS = libs radiantcore radiant plugins install/i18n doc test
 
 # Install data and stuff
 gamedir = $(pkgdatadir)/games

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -2,8 +2,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs \
                $(XML_CFLAGS)
 
 bin_PROGRAMS = test
+testdir = $(pkglibdir)/bin/
 test_CPPFLAGS = $(AM_CPPFLAGS) 
-test_LDFLAGS = -lgtest -lgtest_main \
+test_LDFLAGS = -lgtest -lgtest_main -lX11 \
                 $(XML_LIBS) \
                 $(GLEW_LIBS) \
                 $(GL_LIBS) \