diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-27 08:17:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-27 08:17:50 +0200 |
| commit | b3462c12542a69eeaa3fe90fddfbb15d30c18158 (patch) | |
| tree | 294230cca0e59ee250cd70060ba3f8c3742b4023 /mesalib/src/mesa/Makefile.am | |
| parent | e91ed68959d63f79e3b4973bc80c7ebcd07ed021 (diff) | |
| download | vcxsrv-b3462c12542a69eeaa3fe90fddfbb15d30c18158.tar.gz vcxsrv-b3462c12542a69eeaa3fe90fddfbb15d30c18158.tar.bz2 vcxsrv-b3462c12542a69eeaa3fe90fddfbb15d30c18158.zip | |
xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman
xkeyboard-config git update 27 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/Makefile.am')
| -rw-r--r-- | mesalib/src/mesa/Makefile.am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am index f1cd6d67c..6964c8a68 100644 --- a/mesalib/src/mesa/Makefile.am +++ b/mesalib/src/mesa/Makefile.am @@ -39,6 +39,8 @@ main/git_sha1.h: main/git_sha1.h.tmp @echo "updating main/git_sha1.h" @if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \ mv main/git_sha1.h.tmp main/git_sha1.h ;\ + else \ + rm main/git_sha1.h.tmp ;\ fi # include glapi_gen.mk for generating glapi headers for GLES @@ -92,7 +94,15 @@ program/lex.yy.c: program/program_lexer.l $(MKDIR_P) program $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< -noinst_LTLIBRARIES = libmesa.la libmesagallium.la +noinst_LTLIBRARIES = +if NEED_LIBMESA +noinst_LTLIBRARIES += libmesa.la +else +check_LTLIBRARIES = libmesa.la +endif +if HAVE_GALLIUM +noinst_LTLIBRARIES += libmesagallium.la +endif SRCDIR = $(top_srcdir)/src/mesa/ BUILDDIR = $(top_builddir)/src/mesa/ @@ -140,13 +150,14 @@ libmesagallium_la_SOURCES = \ libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la libmesagallium_la_LDFLAGS = +if HAVE_GALLIUM # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the library in the current directory. -all-local: libmesa.la libmesagallium.la - ln -f .libs/libmesa.a . +all-local: $(noinst_LTLIBRARIES) ln -f .libs/libmesagallium.a . +endif -CLEANFILES += libmesa.a libmesagallium.a +CLEANFILES += libmesagallium.a pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc |