i965/fs: Pass key->render_to_fbo via src1 of FS_OPCODE_DDY_*.

[mesa.git] / src / mapi / Makefile.am

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index d1f525abda5ee923ab43e88973fac8f1fcb69a88..80ead821cccfb5a973cbda5cbf556c9a4e302793 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -28,6 +28,7 @@ BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
 lib_LTLIBRARIES =
+check_PROGRAMS =
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
@@ -41,11 +42,10 @@ AM_CPPFLAGS =                                                       \
 
 GLAPI = $(top_srcdir)/src/mapi/glapi
 include Makefile.sources
+include glapi/Makefile.sources
 include glapi/gen/glapi_gen.mk
 
 if HAVE_SHARED_GLAPI
-SUBDIRS += shared-glapi/tests
-
 BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
 
 lib_LTLIBRARIES += shared-glapi/libglapi.la
@@ -64,10 +64,64 @@ shared_glapi_libglapi_la_LDFLAGS = \
 
 shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(call glapi_gen_mapi,$<,shared-glapi)
+
+TESTS += shared-glapi-test
+check_PROGRAMS += shared-glapi-test
+
+shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
+shared_glapi_test_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/gtest/include
+shared_glapi_test_LDADD = \
+       $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
+       $(top_builddir)/src/gtest/libgtest.la
 endif
 
 if HAVE_OPENGL
-SUBDIRS += glapi
+noinst_LTLIBRARIES = glapi/libglapi.la
+
+if HAVE_X86_ASM
+if HAVE_X86_64_ASM
+GLAPI_ASM_SOURCES = $(X86_64_API)
+else
+GLAPI_ASM_SOURCES = $(X86_API)
+endif
+endif
+if HAVE_SPARC_ASM
+GLAPI_ASM_SOURCES = $(SPARC_API)
+endif
+
+glapi_libglapi_la_SOURCES = $(GLAPI_UTIL_SOURCES)
+glapi_libglapi_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mesa
+
+if HAVE_SHARED_GLAPI
+glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES)
+glapi_libglapi_la_CPPFLAGS += \
+       -DMAPI_MODE_BRIDGE \
+       -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"
+else
+glapi_libglapi_la_CPPFLAGS += \
+       -DMAPI_MODE_UTIL
+glapi_libglapi_la_SOURCES += \
+       $(GLAPI_SOURCES) \
+       $(GLAPI_ASM_SOURCES) \
+       $(MAPI_UTIL_FILES)
+
+TESTS += glapi-test
+check_PROGRAMS += glapi-test
+
+glapi_test_SOURCES = glapi/tests/check_table.cpp
+glapi_test_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/gtest/include
+
+glapi_test_LDADD = \
+       $(top_builddir)/src/mapi/glapi/libglapi.la \
+       $(top_builddir)/src/gtest/libgtest.la
+endif
 endif
 
 if HAVE_OPENGL_ES1