summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* mesa: use a prefix for the program lexDave Airlie2012-09-151-1/+1
| | | | | | | | | | | | | This avoids us making a global yylex symbol which will interfere will all sorts of apps. with libdricore which can't do symbol visibility currently we pollute the namespace with this. This is a candidate for 9.0 & stable branches. Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
* mesa: Kill ES2 wrapper functionsIan Romanick2012-08-291-15/+0
| | | | | | | | | v2: Fix completely broken condition around ClearColorIiEXT and ClearColorIuiEXT. v3: Add special VertexAttrib handling for ES2. Signed-off-by: Ian Romanick <[email protected]>
* build: Only build libmesa.la when neededMatt Turner2012-08-241-4/+8
| | | | Namely, for Xlib-GLX, OSMesa, or test programs.
* build: don't leave git_sha1.h.tmp after build/installVadim Girlin2012-08-241-0/+2
| | | | | | | | Fixes "`main/git_sha1.h.tmp': Permission denied" build error. See https://bugs.freedesktop.org/show_bug.cgi?id=52064 Signed-off-by: Vadim Girlin <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* build: Only build libmesagallium.la if building GalliumMatt Turner2012-08-221-2/+7
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* build: Use MKDIR_P in src/mesa/Makefile.amMatt Turner2012-08-141-2/+2
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* build: Use AM_V_GEN in src/mesa/Makefile.amMatt Turner2012-08-141-4/+4
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* build: Fix out-of-tree generation of api_exec_es{1,2}.cMatt Turner2012-08-141-2/+2
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* build: fix location of generated files in src/mesa (v4)Christopher James Halse Rogers2012-08-131-2/+11
| | | | | | | | | | | | | | | Also fix include paths for the generated headers. v2: Switch to using self-explanatory BUILDDIR/SRCDIR defined from top_builddir/top_srcdir rather than the ambiguous TOP. v3: Add both top_builddir and top_srcdir to include flags for mesa asm. These rely on both in-tree and build-time-generated includes. v4: Rebased on top of 948c8f502a. Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Christopher James Halse Rogers <[email protected]> Signed-off-by: Matt Turner <[email protected]>
* Move installing osmesa.pc to drivers/osmesaJon TURNEY2012-07-311-5/+0
| | | | | | | | | | | | | | | | Move installing osmesa.pc to drivers/osmesa, where it belongs better This also restores the installation of gl.pc if we are building osmesa at the same time as libGL, which was broken in commit 39785488 when the .pc installation was converted to automake v2: Remove HAVE_OSMESA_DRIVER automake conditional, it's now pointless as we will only be building in the drivers/osmesa directory if the condition it checked was true. Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* android-build: fix dricore build for autogenerated files (v3)Daniel Charles2012-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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]>
* Remove redundant osmesa shared library install from Makefile.oldJon TURNEY2012-07-251-3/+4
| | | | | | | | | | | | | | | | Since osmesa now has been converted to Makefile.am, an appropriate install: rule is generated to install the shared libary, so we no longer need to do that in src/mesa/Makefile.old This leaves nothing in src/mesa/Makefile.old but the tags: rule, so move that to Makefile.am and remove Makefile.old Also, nothing now uses OSMESA_LIB_GLOB anymore, so remove it Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* Fix building mesa with assembly enabled since a112ca5dJon TURNEY2012-07-161-2/+3
| | | | | | | | | | | | a112ca5d rather crassly smashed all the compiler flags together into AM_CFLAGS. Separate them out the way they were before, putting pre-processor flags into AM_CPPFLAGS, so assembly source gets preprocessed with the correct pre-processor flags as well. Also, remove unneeded CFLAGS from AM_CFLAGS, and CXXFLAGS from AM_CXXFLAGS Signed-off-by: Jon TURNEY <[email protected]> Tested-by: Brian Paul <[email protected]>
* automake: convert libmesa and libmesagalliumJon TURNEY2012-07-131-4/+43
| | | | | | | | | | | | | | | | | * "configure substitutions are not allowed in _SOURCES variables" in automake, so instead of MESA_ASM_FILES, use some AM_CONDITIONALS to choose which architecture's asm sources are used in libmesa_la_SOURCES. (Can't remove MESA_ASM_FILES autoconf variable as it's still used in sources.mak) * Update to link with the .la file in other Makefile.am files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: Remove stray -static from LDFLAGS v3: Remove .a compatibility link on clean Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* mesa: point to Makefile.old in the srcdirDylan Noblesmith2012-07-021-3/+3
| | | | | | Gets out-of-tree builds slightly closer to working. Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: fix parser source gen for out-of-tree buildsDylan Noblesmith2012-07-021-0/+2
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: fix api source gen for out-of-tree buildsDylan Noblesmith2012-07-021-2/+4
| | | | | | Add $(srcdir) where needed. Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Convert Mesa built sources generation to automake.Eric Anholt2012-06-211-0/+65
|
* mesa: Move GL header installation to automake.Eric Anholt2012-06-211-0/+3
| | | | | This cuts some cruft related to osmesa where we were being careful to not install headers twice.
* automake: Move mesa subdirs processing to automake.Eric Anholt2012-06-211-0/+2
|
* automake: Move .pc installation to automake.Eric Anholt2012-06-211-0/+8
|
* automake: Move the master Mesa makefile to Makefile.old.Eric Anholt2012-06-211-0/+29
This will let me incrementally move stuff to automake without converting libmesa.a all at once.