i965: Initialize INTEL_DEBUG once per process.

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

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 884383652d3eacf7355c4f59a8c5507cf29315ce..932db4fb87cf164ed63f9ab3238603b0b49b5d80 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -25,7 +25,7 @@ if HAVE_X11_DRIVER
 SUBDIRS += drivers/x11
 endif
 
-if HAVE_DRI
+if HAVE_DRICOMMON
 SUBDIRS += drivers/dri
 endif
 
@@ -36,18 +36,18 @@ endif
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.PHONY: main/git_sha1.h.tmp
-main/git_sha1.h.tmp:
+.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
+$(BUILDDIR)main/git_sha1.h.tmp:
        @touch main/git_sha1.h.tmp
-       @if test -d ../../.git; then \
+       @if test -d $(top_srcdir)/.git; then \
                if which git > /dev/null; then \
-                   git log -n 1 --oneline | \
+                   git --git-dir=$(top_srcdir)/.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
+$(BUILDDIR)main/git_sha1.h: $(BUILDDIR)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 ;\
@@ -63,14 +63,15 @@ BUILDDIR = $(builddir)/
 include Makefile.sources
 
 BUILT_SOURCES = \
-       main/git_sha1.h \
        main/get_hash.h \
+        main/format_info.c \
+       $(BUILDDIR)main/git_sha1.h \
        $(BUILDDIR)program/program_parse.tab.c \
        $(BUILDDIR)program/lex.yy.c
 CLEANFILES = \
        $(BUILT_SOURCES) \
        $(BUILDDIR)program/program_parse.tab.h \
-       git_sha1.h.tmp
+       $(BUILDDIR)main/git_sha1.h.tmp
 
 GET_HASH_GEN = main/get_hash_generator.py
 
@@ -81,6 +82,15 @@ main/get_hash.h: $(GLAPI)/gl_and_es_API.xml main/get_hash_params.py  \
                -f $< > $@.tmp;                                         \
        mv $@.tmp $@;
 
+main/format_info.c: main/formats.csv                                    \
+                    main/format_parser.py main/format_info.py
+       $(AM_V_GEN)set -e;                                              \
+       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/format_info.py        \
+                   $< > $@.tmp;                                         \
+       mv $@.tmp $@;
+
+main/formats.c: main/format_info.c
+
 noinst_LTLIBRARIES = $(ARCH_LIBS)
 if NEED_LIBMESA
 noinst_LTLIBRARIES += libmesa.la
@@ -95,6 +105,12 @@ AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
 
+ARCH_LIBS =
+
+if SSE41_SUPPORTED
+ARCH_LIBS += libmesa_sse41.la
+endif
+
 MESA_ASM_FILES_FOR_ARCH =
 
 if HAVE_X86_ASM
@@ -103,12 +119,6 @@ noinst_PROGRAMS = gen_matypes
 gen_matypes_SOURCES = x86/gen_matypes.c
 BUILT_SOURCES += matypes.h
 
-ARCH_LIBS =
-
-if SSE41_SUPPORTED
-ARCH_LIBS += libmesa_sse41.la
-endif
-
 if HAVE_X86_64_ASM
 MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
 AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
@@ -125,36 +135,35 @@ endif
 libmesa_la_SOURCES = \
        $(MESA_FILES) \
        $(PROGRAM_FILES) \
-        $(MESA_ASM_FILES_FOR_ARCH)
+       $(MESA_ASM_FILES_FOR_ARCH)
 
 libmesa_la_LIBADD = \
-        $(top_builddir)/src/glsl/libglsl.la \
-       $(ARCH_LIBS) \
-        $()
+       $(top_builddir)/src/glsl/libglsl.la \
+       $(ARCH_LIBS)
 
 libmesagallium_la_SOURCES = \
        $(MESA_GALLIUM_FILES) \
        $(PROGRAM_FILES) \
-        $(MESA_ASM_FILES_FOR_ARCH)
+       $(MESA_ASM_FILES_FOR_ARCH)
 
 libmesagallium_la_LIBADD = \
-        $(top_builddir)/src/glsl/libglsl.la \
-       $(ARCH_LIBS) \
-        $()
+       $(top_builddir)/src/glsl/libglsl.la \
+       $(ARCH_LIBS)
 
 libmesa_sse41_la_SOURCES = \
-       main/streaming-load-memcpy.c
+       main/streaming-load-memcpy.c \
+       main/sse_minmax.c
 libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) -msse4.1
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gl.pc
 
 $(BUILDDIR)program/lex.yy.c: program/program_lexer.l
-       $(MKDIR_P) $(builddir)/program
+       $(AM_V_at)$(MKDIR_P) program
        $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
 
 $(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y
-       $(MKDIR_P) $(builddir)/program
+       $(AM_V_at)$(MKDIR_P) program
        $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $<
 
 if GEN_ASM_OFFSETS