diff options
| author | Eric Anholt <[email protected]> | 2012-11-07 16:33:39 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-11-12 15:52:42 -0800 |
| commit | 907844107252260c646aca361191ef7f121f3d23 (patch) | |
| tree | cf9a5a54b804e852344541a096992943687e2a6a /src/mesa/libdricore | |
| parent | 0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e (diff) | |
automake,android: Build program/ into a helper lib (v2)
While simplifying mesa/Makefile.am, the more important feature of this commit
is allowing a file with the same name to appear in both main/ and program/.
v2: [chadv] Add changes to Android makefiles.
Reviewed-by: Kenneth Graunke <[email protected]> (v1)
Signed-off-by: Chad Versace <[email protected]> (v2)
Diffstat (limited to 'src/mesa/libdricore')
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 6958e327a3e..21454aad723 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -41,7 +41,9 @@ libdricore@VERSION@_la_SOURCES = \ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ $(top_builddir)/src/glsl/builtin_function.cpp libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 -libdricore@VERSION@_la_LIBADD = libdricore-asm.la +libdricore@VERSION@_la_LIBADD = \ + ../program/libdricore_program.la \ + libdricore-asm.la # This is separated from libdricore to avoid conflics in object # outputs between main/clip.c and sparc/clip.c. The documented way to |