diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-23 02:00:52 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-23 02:00:52 +0000 |
| commit | 6aaceef3231818682dccf1969b211f1dc798da1f (patch) | |
| tree | a13f6d250cfa02f1613297d65d9d14e9d700d8ba | |
| parent | d7e2cadb13ef0e77d864c8282489f544b0e1dede (diff) | |
Fix the build system to reflect the rest of the Mesa core. Almost links,
needs a code fix to Mesa though.
| -rw-r--r-- | GL/mesa/Makefile.am | 7 | ||||
| -rw-r--r-- | GL/mesa/X/Makefile.am | 5 | ||||
| -rw-r--r-- | GL/mesa/shader/Makefile.am | 7 | ||||
| -rw-r--r-- | GL/mesa/shader/grammar/Makefile.am | 15 | ||||
| -rw-r--r-- | GL/mesa/shader/slang/Makefile.am | 25 |
5 files changed, 54 insertions, 5 deletions
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index 43f17f46e..72a7488eb 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -1,13 +1,16 @@ -SUBDIRS = main math array_cache swrast swrast_setup tnl shader X +SUBDIRS = glapi main math array_cache swrast swrast_setup tnl shader X noinst_LTLIBRARIES = libGLcore.la libGLcore_la_SOURCES = dummy.c -libGLcore_la_LIBADD = main/libmain.la \ +libGLcore_la_LIBADD = glapi/libglapi.la \ + main/libmain.la \ math/libmath.la \ array_cache/libac.la \ swrast/libswrast.la \ swrast_setup/libss.la \ tnl/libtnl.la \ shader/libshader.la \ + shader/grammar/libgrammar.la \ + shader/slang/libslang.la \ X/libX.la diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index e79e2b9e4..e2e6bf8bb 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -20,7 +20,10 @@ AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server libX_la_SOURCES = xf86glx.c \ xf86glx_util.c \ xm_api.c \ + xm_buffer.c \ xm_dd.c \ xm_line.c \ xm_span.c \ - xm_tri.c + xm_tri.c \ + indirect_size.c \ + drivers/common/driverfuncs.c diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index 65d9faf51..06c98a564 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = grammar slang + noinst_LTLIBRARIES = libshader.la INCLUDES = -I@MESA_SOURCE@/include \ @@ -7,6 +9,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I$(srcdir)/../main \ -I$(srcdir)/../math \ -I$(srcdir)/../shader \ + -I$(srcdir)/../shader/grammar \ + -I$(srcdir)/../shader/slang \ -I$(srcdir)/../swrast \ -I$(srcdir)/../swrast_setup \ -I$(srcdir)/../tnl \ @@ -23,5 +27,4 @@ libshader_la_SOURCES = arbfragparse.c \ nvvertparse.c \ program.c \ shaderobjects.c \ - shaderobjects_3dlabs.c \ - grammar_mesa.c + shaderobjects_3dlabs.c diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am new file mode 100644 index 000000000..ce9e7d67c --- /dev/null +++ b/GL/mesa/shader/grammar/Makefile.am @@ -0,0 +1,15 @@ +noinst_LTLIBRARIES = libgrammar.la + +INCLUDES = -I@MESA_SOURCE@/include \ + -I$(srcdir)/../../X \ + -I$(srcdir)/../../array_cache \ + -I$(srcdir)/../../glapi \ + -I$(srcdir)/../../main \ + -I$(srcdir)/../../math \ + -I$(srcdir)/../../shader \ + -I$(srcdir)/../../swrast \ + -I$(srcdir)/../../swrast_setup \ + -I$(srcdir)/../../tnl \ + -I$(srcdir)/../.. + +libgrammar_la_SOURCES = grammar_mesa.c diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am new file mode 100644 index 000000000..941adf8d4 --- /dev/null +++ b/GL/mesa/shader/slang/Makefile.am @@ -0,0 +1,25 @@ +noinst_LTLIBRARIES = libslang.la + +INCLUDES = -I@MESA_SOURCE@/include \ + -I$(srcdir)/../grammar \ + -I$(srcdir)/../../X \ + -I$(srcdir)/../../array_cache \ + -I$(srcdir)/../../glapi \ + -I$(srcdir)/../../main \ + -I$(srcdir)/../../math \ + -I$(srcdir)/../../shader \ + -I$(srcdir)/../../swrast \ + -I$(srcdir)/../../swrast_setup \ + -I$(srcdir)/../../tnl \ + -I$(srcdir)/../.. + +libslang_la_SOURCES = slang_assemble_assignment.c \ + slang_assemble.c \ + slang_assemble_conditional.c \ + slang_assemble_constructor.c \ + slang_assemble_typeinfo.c \ + slang_compile.c \ + slang_execute.c \ + slang_preprocess.c \ + slang_storage.c \ + slang_utility.c |