summaryrefslogtreecommitdiffstats
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Add bin/test-driver to EXTRA_FILESCarl Worth2013-12-131-0/+1
| | | | | | | | | | | | | | I'm not sure why this change is necessary. When I've built previous tar files (such as 9.2.4) with the "make tarballs" target, they include the bin/test-driver file. But at my first attempt to build the tar files for the 10.0.1 release this file was not being included and the build failed. (cherry picked from commit d573899b932435b0b37a7a33ebcbdc3c8cedd3e1) [The cherry pick is because I original applied this on the 10.0 branch while working on the 10.0.1 release. But if we don't have this on master as well, this issue will trip us up again the next time we make a new major-release branch off of master.]
* automake: include only one copy VERSION in tarballEmil Velikov2013-12-031-1/+0
| | | | | | | | | | | | | The VERSION file is tracked by git (git ls-files), thus adding it to EXTRA_FILES will result in a duplicate copy within the final tarball. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72230 Cc: "10.0" <mesa-stable@lists.freedesktop.org> Reported-by: Patrick Steinhardt <ps@pks.im> Tested-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* mesa: Build program as part of libmesa.Matt Turner2013-11-061-1/+1
|
* Makefile.am: Remove api_exec_es* from EXTRA_FILES.Matt Turner2013-08-021-6/+0
| | | | | | These files were removed in commits a0102154 and a8ab7e33. Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
* build: unify mesa version by using a VERSION fileEmil Velikov2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | Rather than having to keep track of all the build systems and their respecitve definition of the mesa version, use a single top file VERSION. Every build system is responsible for reading/parsing the file and using it v2: * remove useless bulletpoint from the documentation, suggested by Matt * "Androing is Linux. Use '/' in stead of '\'", spotted by Chad V * use cleaner code to get the version in scons, suggested by Chad V v3: * ensure leading and trailing whitespace characters are stripped while parsing * android: handle GNU shell commands approapriately Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* build: Add tests directories to SUBDIRSMatt Turner2013-07-221-6/+0
| | | | Fixes a problem with distcheck.
* build: Use PACKAGE_VERSION from autoconfAndreas Boll2013-06-061-1/+0
| | | | | | Both variables had the same value. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* build: Unify PACKAGE_VERSION on autotools, scons and AndroidAndreas Boll2013-06-061-1/+1
| | | | | | | | | | | | | | This patch unifies mesa's PACKAGE_VERSION on autotools, scons and Android build systems. Current behaviour is: - Autotools uses 9.2.0 as PACKAGE_VERSION - Scons and Android use 9.2-devel as PACKAGE_VERSION With this patch all three build systems use 9.2.0-devel as PACKAGE_VERSION. Reviewed-by: Brian Paul <brianp@vmware.com>
* mesa: bump version to 9.2 (devel)Andreas Boll2013-01-311-1/+1
| | | | | | | Now that branch 9.1 is created, bump the minor version in master. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* glsl/build: Build tests via the glsl MakefileMatt Turner2013-01-221-1/+0
| | | | Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
* glsl/build: Build glcpp via the glsl MakefileMatt Turner2013-01-221-4/+3
| | | | | | Removing the subdirectory recursion provides a small speed up. Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
* Remove configs/{current,default}Matt Turner2013-01-101-18/+0
|
* build: use git ls-files for adding all Makefile.in into the release tarballAndreas Boll2012-11-261-51/+1
| | | | | | | | | | | Until we have proper 'make dist' this is an improvement of the current situation, because each time some old Makefiles got converted to automake we had to update the tarballs target. NOTE: This is a candidate for the 9.0 branch. Cc: Eric Anholt <eric@anholt.net> Acked-by: Matt Turner <mattst88@gmail.com>
* build: add missing Makefile.in files to tarballs targetAndreas Boll2012-11-161-0/+3
| | | | | | Those are recently introduced on master. Reviewed-by: Matt Turner <mattst88@gmail.com>
* build: fix make tarballs targetAndreas Boll2012-11-161-1/+1
| | | | | | | | | fixes regression introduced in 907844107252260c646aca361191ef7f121f3d23 Targets for making lex.yy.c program_parse.tab.c and program_parse.tab.h got moved into its own Makefile Reviewed-by: Matt Turner <mattst88@gmail.com>
* build: add missing files to tarballs targetAndreas Boll2012-11-141-0/+6
| | | | | | | | fixes errors ./configure and make was complaining about NOTE: This is a candidate for the 9.0 branch. Reviewed-by: Matt Turner <mattst88@gmail.com>
* build: add missing Makefile.in files to tarballs targetAndreas Boll2012-11-141-1/+50
| | | | | | | | fixes errors ./configure was complaining about NOTE: This is a candidate for the 9.0 branch. Reviewed-by: Matt Turner <mattst88@gmail.com>
* build: add config.sub and config.guess to tarballs targetAndreas Boll2012-11-141-0/+2
| | | | | | | | fixes errors ./configure was complaining about NOTE: This is a candidate for the 9.0 branch. Reviewed-by: Matt Turner <mattst88@gmail.com>
* build: Ship install-sh in the tarballMatt Turner2012-10-251-0/+1
| | | | | | | | | | Fixes the problem where configure from the tarball would report missing files: $ ./configure configure: error: cannot find install-sh, install.sh, or shtool in bin NOTE: This is a candidate for the 9.0 branch.
* build: Use AX_PTHREAD to detect pthreadsMatt Turner2012-09-271-0/+2
| | | | | | NOTE: This is a candidate for the 9.0 branch. Reviewed-by: Adam Jackson <ajax@redhat.com>
* mesa: bump version to 9.1 (devel)Andreas Boll2012-09-091-1/+1
| | | | | | | Now that branch 9.0 is created, bump the minor version in master. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* mesa: also bump version in Makefile.am and configure.ac to 9.0Andreas Boll2012-08-311-1/+1
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* mesa/tests: Add tests for the generated shared-glapi dispatch tableIan Romanick2012-08-081-0/+1
| | | | | | | | | These are largely based on the src/mapi/glapi/tests. However, shared-glapi provides less external visibility into the dispatch table, so there is less to test. Also, shared-glapi does not implement _glapi_get_proc_name, so that test was removed. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
* automake: convert libglslJon TURNEY2012-07-131-3/+3
| | | | | | | | | | | | | | | | | | | | v2: Use AM_V_GEN to silence generated code rules. Add BUILT_SOURCES to CLEANFILES v3: - Fix an accidental // in a path - Use automake make rules for lex/yacc rather than writing our own - Update .gitignore appropriately - Build a libglcpp convenience library rather than awkwardly including the files in libglsl and delegating the generation - Remove libglsl.a compatibility link on clean v4: - Automake's rules for lex/yacc make .cc if source is .ll or .yy, and apparently we must use those extensions "because of scons", so update everywhere glsl_parser.cpp -> glsl_parser.cc and glsl_lexer.cpp -> glsl_lexer.cc. This fixes 'make tarballs' and building with dricore enabled. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
* automake: Directly generate configs/current instead of symlinking from it.Eric Anholt2012-06-211-1/+0
|
* mesa/tests: Add tests for the generated dispatch tableIan Romanick2012-06-131-0/+1
| | | | | Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
* mesa/tests: Add tests for _mesa_lookup_enum_by_{name,nr} functionsIan Romanick2012-06-131-0/+1
| | | | | Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
* glx: Move tests from tests/glx to src/glx/testsIan Romanick2012-06-131-3/+2
| | | | | | | This matches the organization of other unit tests in Mesa. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
* automake: Move top-level makefile to automake.Eric Anholt2012-06-111-0/+124
This is part of a series to fix our build issues in the automake case by hooking up the automatic Makefile regeneration support. The extract_git_sha1 is moved into src/mesa/Makefile so that we get correct dependency generation. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>