diff options
| author | Keith Packard <keithp@keithp.com> | 2008-05-04 22:24:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-05-04 22:24:56 -0700 |
| commit | 33e5a176e62a0114cb8cca9447798c6d6b6665ed (patch) | |
| tree | 8efa34606aae171fe1bad7aff993a2a94910d76e /GL/mesa/shader | |
| parent | e48f6bcd94b310e5c79939bdb1703f9555a3cdd1 (diff) | |
| parent | efa65a0317e12c9ad34fa00fe90bf5eae9fa2670 (diff) | |
Merge commit 'origin/master' into transform-proposal-oldtransform-proposal
Conflicts:
configure.ac
exa/exa.c
Diffstat (limited to 'GL/mesa/shader')
| -rw-r--r-- | GL/mesa/shader/Makefile.am | 39 | ||||
| -rw-r--r-- | GL/mesa/shader/grammar/Makefile.am | 20 | ||||
| -rw-r--r-- | GL/mesa/shader/slang/Makefile.am | 41 |
3 files changed, 0 insertions, 100 deletions
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am deleted file mode 100644 index abde27513..000000000 --- a/GL/mesa/shader/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -SUBDIRS = grammar slang - -noinst_LTLIBRARIES = libshader.la - -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - -DXFree86Server \ - @GLX_DEFINES@ - -INCLUDES = -I@MESA_SOURCE@/include \ - -I../X \ - -I../glapi \ - -I../main \ - -I../math \ - -I../shader \ - -I../shader/grammar \ - -I../shader/slang \ - -I../swrast \ - -I../swrast_setup \ - -I../tnl \ - -I.. \ - -I$(top_srcdir)/hw/xfree86/os-support - -nodist_libshader_la_SOURCES = \ - arbprogparse.c \ - arbprogram.c \ - atifragshader.c \ - nvfragparse.c \ - nvprogram.c \ - nvvertparse.c \ - prog_debug.c \ - prog_execute.c \ - prog_instruction.c \ - prog_parameter.c \ - prog_print.c \ - program.c \ - programopt.c \ - prog_statevars.c \ - shader_api.c diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am deleted file mode 100644 index 332c8e952..000000000 --- a/GL/mesa/shader/grammar/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LTLIBRARIES = libgrammar.la - -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - -DXFree86Server \ - @GLX_DEFINES@ - -INCLUDES = -I@MESA_SOURCE@/include \ - -I../../X \ - -I../../glapi \ - -I../../main \ - -I../../math \ - -I../../shader \ - -I../../swrast \ - -I../../swrast_setup \ - -I../../tnl \ - -I../.. \ - -I$(top_srcdir)/hw/xfree86/os-support - -nodist_libgrammar_la_SOURCES = grammar_mesa.c diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am deleted file mode 100644 index 71498eeac..000000000 --- a/GL/mesa/shader/slang/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -noinst_LTLIBRARIES = libslang.la - -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - -DXFree86Server \ - @GLX_DEFINES@ - -INCLUDES = -I@MESA_SOURCE@/include \ - -I../grammar \ - -I../../X \ - -I../../glapi \ - -I../../main \ - -I../../math \ - -I../../shader \ - -I../../swrast \ - -I../../swrast_setup \ - -I../../tnl \ - -I../.. \ - -I$(top_srcdir)/hw/xfree86/os-support - -nodist_libslang_la_SOURCES = slang_builtin.c \ - slang_codegen.c \ - slang_compile.c \ - slang_compile_function.c \ - slang_compile_operation.c \ - slang_compile_struct.c \ - slang_compile_variable.c \ - slang_emit.c \ - slang_ir.c \ - slang_label.c \ - slang_library_noise.c \ - slang_link.c \ - slang_log.c \ - slang_mem.c \ - slang_preprocess.c \ - slang_print.c \ - slang_simplify.c \ - slang_storage.c \ - slang_typeinfo.c \ - slang_utility.c \ - slang_vartable.c |