mesa: make _mesa_validate_sync() non-static

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 6a2d4252bf8ffc5266f40246c817d3ffef302c25..e9c16e78ed491163947c7e50269cfc49e86d167e 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,21 +19,127 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = x86 x86-64 . libdricore drivers
+if NEED_LIBDRICORE
+DRICORE_SUBDIR = libdricore
+endif
 
-all-local:
-       $(MAKE) -f Makefile.old
+SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) main/tests
 
-install-exec-local:
-       $(MAKE) -f Makefile.old install
+if HAVE_X11_DRIVER
+SUBDIRS += drivers/x11
+endif
 
-clean-local:
-       $(MAKE) -f Makefile.old clean
+if HAVE_DRI
+SUBDIRS += drivers/dri
+endif
 
-pkgconfigdir = $(libdir)/pkgconfig
+if HAVE_OSMESA
+SUBDIRS += drivers/osmesa
+endif
+
+gldir = $(includedir)/GL
+gl_HEADERS = $(top_srcdir)/include/GL/*.h
+
+.PHONY: main/git_sha1.h.tmp
+main/git_sha1.h.tmp:
+       @touch main/git_sha1.h.tmp
+       @if test -d ../../.git; then \
+               if which git > /dev/null; then \
+                   git log -n 1 --oneline | \
+                       sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
+                       > main/git_sha1.h.tmp ; \
+               fi \
+       fi
+
+main/git_sha1.h: main/git_sha1.h.tmp
+       @echo "updating main/git_sha1.h"
+       @if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
+               mv main/git_sha1.h.tmp main/git_sha1.h ;\
+       else \
+               rm main/git_sha1.h.tmp ;\
+       fi
 
-if HAVE_OSMESA_DRIVER
-pkgconfig_DATA = osmesa.pc
+# include glapi_gen.mk for generating glapi headers for GLES
+GLAPI = $(top_srcdir)/src/mapi/glapi/gen
+include $(GLAPI)/glapi_gen.mk
+
+BUILT_SOURCES = \
+       main/git_sha1.h \
+       main/get_hash.h
+CLEANFILES = \
+       $(BUILT_SOURCES) \
+       git_sha1.h.tmp
+
+GET_HASH_GEN = main/get_hash_generator.py
+
+main/get_hash.h: $(GLAPI)/gl_and_es_API.xml main/get_hash_params.py    \
+                $(GET_HASH_GEN) Makefile
+       $(AM_V_GEN)set -e;                                              \
+       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/$(GET_HASH_GEN)            \
+               -f $< > $@.tmp;                                         \
+       mv $@.tmp $@;
+
+noinst_LTLIBRARIES =
+if NEED_LIBMESA
+noinst_LTLIBRARIES += libmesa.la
 else
-pkgconfig_DATA = gl.pc
+check_LTLIBRARIES = libmesa.la
+endif
+if HAVE_GALLIUM
+noinst_LTLIBRARIES += libmesagallium.la
 endif
+
+SRCDIR = $(top_srcdir)/src/mesa/
+BUILDDIR = $(top_builddir)/src/mesa/
+include Makefile.sources
+
+AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
+AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
+
+MESA_ASM_FILES_FOR_ARCH =
+
+if HAVE_X86_ASM
+MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
+AM_CPPFLAGS += \
+        -I$(top_builddir)/src/mesa/x86 \
+        -I$(top_srcdir)/src/mesa/x86
+endif
+if HAVE_X86_64_ASM
+MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
+AM_CPPFLAGS += \
+        -I$(top_builddir)/src/mesa/x86-64 \
+        -I$(top_srcdir)/src/mesa/x86-64
+endif
+if HAVE_SPARC_ASM
+MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES)
+AM_CPPFLAGS += \
+        -I$(top_builddir)/src/mesa/sparc \
+        -I$(top_srcdir)/src/mesa/sparc
+endif
+
+libmesa_la_SOURCES = \
+       $(MESA_FILES) \
+        $(MESA_ASM_FILES_FOR_ARCH)
+
+libmesa_la_LIBADD = \
+        $(top_builddir)/src/glsl/libglsl.la \
+        $(top_builddir)/src/mesa/program/libprogram.la \
+        $()
+libmesa_la_LDFLAGS =
+
+libmesagallium_la_SOURCES = \
+       $(MESA_GALLIUM_FILES) \
+        $(MESA_ASM_FILES_FOR_ARCH)
+
+libmesagallium_la_LIBADD = \
+        $(top_builddir)/src/glsl/libglsl.la \
+        $(top_builddir)/src/mesa/program/libprogram.la \
+        $()
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gl.pc
+
+# Emacs tags
+tags:
+       etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h