diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-25 09:22:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-25 09:22:25 +0200 |
| commit | 5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0 (patch) | |
| tree | c532fb2a693321cc9960fd554654e60351d63249 /mesalib/src/mesa/program | |
| parent | 42cd4a1fab6d183e218bd8c6bd65f65211af4d7c (diff) | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.tar.gz vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.tar.bz2 vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 25 oct 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/Makefile.am | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/mesalib/src/mesa/program/Makefile.am b/mesalib/src/mesa/program/Makefile.am index ab565e251..5e05782fb 100644 --- a/mesalib/src/mesa/program/Makefile.am +++ b/mesalib/src/mesa/program/Makefile.am @@ -24,25 +24,13 @@ include ../Makefile.sources AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS) AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS) -libdricore_program_la_CXXFLAGS = $(NOVISIBILITY_CXXFLAGS) SRCDIR = $(top_srcdir)/src/mesa/ BUILDDIR = $(top_builddir)/src/mesa/ -if NEED_LIBDRICORE -DRICORE_LIB = libdricore_program.la -endif - -noinst_LTLIBRARIES = $(DRICORE_LIB) -if NEED_LIBPROGRAM -noinst_LTLIBRARIES += libprogram.la -else -check_LTLIBRARIES = libprogram.la -endif +noinst_LTLIBRARIES = libprogram.la libprogram_la_SOURCES = $(PROGRAM_FILES) -libdricore_program_la_SOURCES = $(PROGRAM_FILES) lex.yy.c: program_lexer.l $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< |