diff options
| author | Daniel Charles <[email protected]> | 2012-07-26 14:18:15 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-07-26 14:51:20 -0700 |
| commit | 948c8f502a3b3144588a6e707b0ea60afa766ebb (patch) | |
| tree | 4c8e60552c7b1f27b6a55cf8fa372284c485583f /src/mesa/libdricore | |
| parent | 0e893b42610a2e8f2797bd7da68669dac38d9538 (diff) | |
android-build: fix dricore build for autogenerated files (v3)
Recently more files were removed from control to be auto-generated
in the dricore library. Android build was not able to locate the
new files if they were not created beforehand.
LOCAL_SRC_FILES includes some of those files and Android.gen.mk
re-defines this variable by filtering out the auto-generated files.
Unfortunately for this variable it is not the same to have the SRCDIR
variable defined as the current directory.
By re-defining SRCDIR for the autotools build the Android build system
is happy again and the new files were actually removed from the sources
to use the auto generated versions.
Also patch d5c1801a018efda8ac2b was partially reverted as the files
can not be compiled to the LOCAL_PATH, instead they should live on the
intermediates folder so that a clean can wipe them out.
v3: [chad] Fix the definition of SRCDIR in libdricore/Makefile.am.
Signed-off-by: Chad Versace <[email protected]>
Signed-off-by: Daniel Charles <[email protected]>
Diffstat (limited to 'src/mesa/libdricore')
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 26d8a88fddc..0b18fc0ce0a 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -20,7 +20,7 @@ # IN THE SOFTWARE. TOP=$(top_srcdir) -SRCDIR = $(srcdir)/.. +SRCDIR = $(srcdir)/../ include ../sources.mak GLSL_SRCDIR = $(srcdir)/../../glsl include ../../glsl/Makefile.sources |