From 2f9a7c6ee1012b2c7664c53f405affaf82bd0953 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sat, 16 Jul 2005 04:13:33 +0000 Subject: Hey look, GLcore links --- GL/mesa/Makefile.am | 8 ++++++++ GL/mesa/X/Makefile.am | 17 +++++++++++++++++ GL/mesa/array_cache/Makefile.am | 12 ++++++++++++ GL/mesa/dummy.c | 0 GL/mesa/main/Makefile.am | 12 ++++++++++++ GL/mesa/math/Makefile.am | 12 ++++++++++++ GL/mesa/shader/Makefile.am | 15 ++++++++++++++- GL/mesa/swrast/Makefile.am | 12 ++++++++++++ GL/mesa/swrast_setup/Makefile.am | 12 ++++++++++++ GL/mesa/tnl/Makefile.am | 12 ++++++++++++ 10 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 GL/mesa/dummy.c diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index d826e94e0..43f17f46e 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -3,3 +3,11 @@ SUBDIRS = 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 \ + math/libmath.la \ + array_cache/libac.la \ + swrast/libswrast.la \ + swrast_setup/libss.la \ + tnl/libtnl.la \ + shader/libshader.la \ + X/libX.la diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index 2c7de90d1..d5fc98b85 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -1,5 +1,22 @@ noinst_LTLIBRARIES = libX.la +INCLUDES = -I@mesadir@/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)/.. \ + -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/GL/include + +# terribly gross hack. i need a shower now. +AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server + libX_la_SOURCES = xf86glx.c \ xf86glx_util.c \ xm_api.c \ diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index 7981214df..498f6f875 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -1,3 +1,15 @@ noinst_LTLIBRARIES = libac.la +INCLUDES = -I@mesadir@/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)/.. + libac_la_SOURCES = ac_context.c ac_import.c diff --git a/GL/mesa/dummy.c b/GL/mesa/dummy.c new file mode 100644 index 000000000..e69de29bb diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index d395f90ca..a81ebc750 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -1,5 +1,17 @@ noinst_LTLIBRARIES = libmain.la +INCLUDES = -I@mesadir@/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)/.. + libmain_la_SOURCES = accum.c \ api_arrayelt.c \ api_loopback.c \ diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am index 154672d42..5a59ddd22 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -1,5 +1,17 @@ noinst_LTLIBRARIES = libmath.la +INCLUDES = -I@mesadir@/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)/.. + libmath_la_SOURCES = m_debug_clip.c \ m_debug_norm.c \ m_debug_xform.c \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index fb977f02d..a8b00144d 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -1,5 +1,17 @@ noinst_LTLIBRARIES = libshader.la +INCLUDES = -I@mesadir@/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)/.. + libshader_la_SOURCES = arbfragparse.c \ arbprogparse.c \ arbprogram.c \ @@ -11,4 +23,5 @@ libshader_la_SOURCES = arbfragparse.c \ nvvertparse.c \ program.c \ shaderobjects.c \ - shaderobjects_3dlabs.c + shaderobjects_3dlabs.c \ + grammar_mesa.c diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index 53c885f4f..9633aaa4f 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -1,5 +1,17 @@ noinst_LTLIBRARIES = libswrast.la +INCLUDES = -I@mesadir@/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)/.. + libswrast_la_SOURCES = s_aaline.c \ s_aatriangle.c \ s_accum.c \ diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index 1fa8da941..24960e10e 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -1,3 +1,15 @@ noinst_LTLIBRARIES = libss.la +INCLUDES = -I@mesadir@/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)/.. + libss_la_SOURCES = ss_context.c ss_triangle.c diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index c8afba4a3..cb4f1507e 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -1,5 +1,17 @@ noinst_LTLIBRARIES = libtnl.la +INCLUDES = -I@mesadir@/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)/.. + libtnl_la_SOURCES = t_array_api.c \ t_array_import.c \ t_context.c \ -- cgit v1.2.3