diff options
| author | Eric Anholt <[email protected]> | 2012-05-29 14:55:40 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-06-11 09:28:00 -0700 |
| commit | 279efce8bb7b6c802eb6c1de46971153ff6fdedb (patch) | |
| tree | dba5bca1ef01018f1156bbbb3e3a8768fec97f5b /src/mesa/libdricore | |
| parent | 446faee094ae6f0a4914b59a9eb87077a1f7b3c5 (diff) | |
automake: Merge the dricore libglsl build into libdricore.
Now we have just one library of "all of Mesa core" instead of both
libdricore and libglsl that drivers link against.
I did this change in a sort of nonrecursive make fashion: the
generated files are still produced in the non-automake build, like the
rest of dricore, but the GLSL files are stuffed into libdricore
without building a convenience library in src/glsl (even though we
could now). This would make a bit more sense if glsl was just another
dir under src/mesa, because right now I had to contort the prefix
variable name to look another ../ level up.
Diffstat (limited to 'src/mesa/libdricore')
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 6fc4bbe80f7..729ddd7c33b 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -22,6 +22,8 @@ TOP=$(top_srcdir) SRCDIR = $(srcdir)/.. include ../sources.mak +GLSL_SRCDIR = $(srcdir)/../../glsl +include ../../glsl/Makefile.sources noinst_PROGRAMS = @@ -38,7 +40,13 @@ AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE libdricore_la_SOURCES = \ $(MESA_FILES) \ - $(MESA_CXX_FILES) + $(MESA_CXX_FILES) \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) \ + $(LIBGLSL_FILES) \ + $(LIBGLSL_CXX_FILES) \ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(top_srcdir)/src/glsl/builtin_function.cpp libdricore_la_LDFLAGS = -module -avoid-version -shared libdricore_la_LIBADD = libdricore-asm.la |