diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
| commit | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch) | |
| tree | e2363fb022bfa7b730b0032b4c35379aa2a997d6 /mesalib/src/mesa/program | |
| parent | e59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff) | |
| parent | ddc05759f098f06bd93253a7bffe38640963dfb3 (diff) | |
| download | vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2 vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/.gitignore
mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'mesalib/src/mesa/program')
| -rwxr-xr-x | mesalib/src/mesa/program/.gitignore | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/Makefile.am | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/.gitignore b/mesalib/src/mesa/program/.gitignore index 9c23422f3..2f1601fcc 100755 --- a/mesalib/src/mesa/program/.gitignore +++ b/mesalib/src/mesa/program/.gitignore @@ -1,4 +1,3 @@ -/Makefile
lex.yy.c
program_parse.output
program_parse.tab.c
diff --git a/mesalib/src/mesa/program/Makefile.am b/mesalib/src/mesa/program/Makefile.am index ea412f56f..1b8204658 100644 --- a/mesalib/src/mesa/program/Makefile.am +++ b/mesalib/src/mesa/program/Makefile.am @@ -35,7 +35,7 @@ DRICORE_LIB = libdricore_program.la endif noinst_LTLIBRARIES = $(DRICORE_LIB) -if HAVE_GALLIUM +if NEED_LIBPROGRAM noinst_LTLIBRARIES += libprogram.la else check_LTLIBRARIES = libprogram.la |