Updated to address various comments: [1/9] libOsmesa links with libaries in the builddir, not the srcdir [2/9] libglsl use AM_V_GEN to silence generated code rules and add BUILT_SOURCES to CLEANFILES [4/9] Remove stray -static from flags for libmesa and libmesagallium [6/9] Remove unndeded libglsl.a from GALLIUM_DRI_LIB_DEPS [9/9] Fix comment to talk about the right library and try to make sense
If you should want to test this, these patches can be pulled from the branch automake-continued-v2 at git://people.freedesktop.org/~jturney/mesa Jon TURNEY (8): automake: convert libglsl Rename sparc/clip.S -> sparc/sparc_clip.S automake: convert libmesa and libmesagallium Remove unused MESA_MODULES autoconf variable Link dri drivers with mesa or dricore libtool library Rename X86-64_API -> X86_64_API automake: convert libglapi Don't explicitly link libOsmesa with libmesa's dependency libglsl Laurent Carlier (1): automake: convert libOSmesa building configs/current.in | 3 +- configure.ac | 27 +++-- src/egl/main/Makefile.am | 2 +- src/gallium/targets/Makefile.dri | 4 +- src/glsl/.gitignore | 1 + src/glsl/Makefile | 144 --------------------- src/glsl/Makefile.am | 112 +++++++++++++++++ src/glsl/glcpp/.gitignore | 1 + src/glsl/glcpp/Makefile.am | 33 +++++ src/glsl/tests/Makefile.am | 4 +- src/glx/Makefile.am | 2 +- src/mapi/glapi/.gitignore | 1 + src/mapi/glapi/Makefile | 77 ------------ src/mapi/glapi/Makefile.am | 69 ++++++++++ src/mapi/glapi/sources.mak | 2 +- src/mapi/glapi/tests/Makefile.am | 2 +- src/mesa/Makefile.am | 45 ++++++- src/mesa/Makefile.old | 57 +--------- src/mesa/SConscript | 2 +- src/mesa/drivers/osmesa/.gitignore | 1 + src/mesa/drivers/osmesa/Makefile | 51 -------- src/mesa/drivers/osmesa/Makefile.am | 49 ++++++++ src/mesa/drivers/x11/Makefile.am | 4 +- src/mesa/main/tests/Makefile.am | 2 +- src/mesa/sources.mak | 2 +- src/mesa/sparc/clip.S | 233 ----------------------------------- src/mesa/sparc/sparc_clip.S | 233 +++++++++++++++++++++++++++++++++++ 27 files changed, 572 insertions(+), 591 deletions(-) delete mode 100644 src/glsl/Makefile create mode 100644 src/glsl/Makefile.am create mode 100644 src/glsl/glcpp/Makefile.am delete mode 100644 src/mapi/glapi/Makefile create mode 100644 src/mapi/glapi/Makefile.am create mode 100644 src/mesa/drivers/osmesa/.gitignore delete mode 100644 src/mesa/drivers/osmesa/Makefile create mode 100644 src/mesa/drivers/osmesa/Makefile.am delete mode 100644 src/mesa/sparc/clip.S create mode 100644 src/mesa/sparc/sparc_clip.S -- 1.7.9 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
