summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/osmesa/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2012-10-01build: Add visibility CFLAGS to OSMesaMatt Turner1-2/+4
2012-10-01build: Link OSMesa with glapi, libdl, libstdc++Matt Turner1-5/+12
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=399813 https://bugs.freedesktop.org/show_bug.cgi?id=53179
2012-09-07Set OSMESA_VERSION=8.Johannes Obermayr1-2/+2
VERSION_NUMBER is not required anymore. So it will be removed. Reviewed-by: Adam Jackson <ajax@redhat.com>
2012-08-24build: Only add links to .so files if we're building themMatt Turner1-0/+2
Xlib-GLX and OSMesa support static building. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=53962
2012-08-24build: Add libOSMesa.so.$(VERSION) link to libdirMatt Turner1-0/+1
2012-08-24build: Replace OSMESA_VERSION with generic VERSION_NUMBERMatt Turner1-1/+1
Can be used by other modules.
2012-08-16build: Remove -shared from OSMesa's LDFLAGSMatt Turner1-1/+1
Would break the static build.
2012-07-31Move installing osmesa.pc to drivers/osmesaJon TURNEY1-2/+3
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 <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net>
2012-07-25drivers/osmesa: Link OSMesa using -no-undefined libtool flagJon TURNEY1-1/+1
"Use -no-undefined to assure libtool that the library has no unresolved symbols at link time, so that libtool will build a shared library on platforms require that all symbols are resolved when the library is linked." Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2012-07-13Don't explicitly link libOsmesa with libmesa's dependency libglslJon TURNEY1-2/+1
The libmesa convenience library is linked with the libglsl convenience library. libOsmesa is linked with libmesa, and also directly with libglsl. When using libtool, this gives rise to duplicate symbol errors. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-07-13automake: convert libglapiJon TURNEY1-1/+1
* "configure substitutions are not allowed in _SOURCES variables" in automake, so remove the AC_SUBST'ed GLAPI_ASM_SOURCES and instead use some AM_CONDITIONALS to choose which asm sources are used * Change GLAPI_LIB to point to 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: - Use AM_CPPFLAGS for cleaner build output - EXTRA_SOURCES is not needed - Remove libglapi.a compatibility link on clean Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-07-13automake: convert libmesa and libmesagalliumJon TURNEY1-1/+1
* "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 <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-07-13automake: convert libglslJon TURNEY1-1/+1
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>
2012-07-13automake: convert libOSmesaLaurent Carlier1-0/+50
This also currently fix the installation of libOSmesa. v2: Remove old Makefile, libOSmesa is now versioned, fix typos v3: Keep config substitution alphabetized v4: Update .gitignore v5: Libraries will be in the builddir, not the srcdir. Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-01-31Revert "automake: src/mesa/drivers/osmesa"Matt Turner1-82/+0
This reverts commit 275ac7e5c1fd6c1847a428192fe259e50690fced.
2012-01-31Revert "automake: src/glsl and src/glsl/glcpp"Matt Turner1-1/+1
This reverts commit 9947656168d09f9019600fccc42ca8e0de49b83a.
2012-01-30automake: src/glsl and src/glsl/glcppMatt Turner1-1/+1
Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Eric Anholt <eric@anholt.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
2012-01-30automake: src/mesa/drivers/osmesaMatt Turner1-0/+82