summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-12-18 13:33:29 -0800
committerMatt Turner <mattst88@gmail.com>2015-01-23 14:28:44 -0800
commit145919b2ab737d3b390a6a8ab77d54719db1e6f8 (patch)
treeeb126491eb26cd23f94387d0f764646335800033 /src/Makefile.am
parenta37ae2ab922a0a7fceb9dba85dba11c26f4cf736 (diff)
glsl: Build a libglsl_util library.
Rather than sourcing files with ../dir/file.c which leads to distclean wiping out ../dir's .deps directory.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 85b75a93b5..8edf33373e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,9 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-SUBDIRS = gtest util mapi/glapi/gen mapi
+AUTOMAKE_OPTIONS = subdir-objects
+
+SUBDIRS = . gtest util mapi/glapi/gen mapi
if NEED_OPENGL_COMMON
SUBDIRS += glsl mesa
@@ -52,3 +54,16 @@ SUBDIRS += gallium
endif
EXTRA_DIST = egl/docs getopt hgl SConscript
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/include/ \
+ -I$(top_srcdir)/src/mapi/ \
+ -I$(top_srcdir)/src/mesa/ \
+ $(DEFINES)
+
+noinst_LTLIBRARIES = libglsl_util.la
+
+libglsl_util_la_SOURCES = \
+ mesa/main/imports.c \
+ mesa/program/prog_hash_table.c \
+ mesa/program/symbol_table.c