X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=Makefile.am;h=fe1ef948918c4c2b91fbd5871733837390689b07;hp=c34f7d8abfb6a16a5f9767d492ffc6173739d07e;hb=e4796ab7c8a5f00c9f35124384c4d0d5fc155541;hpb=0161515c395c44233529c8d51f823b60050bc7ba

diff --git a/Makefile.am b/Makefile.am
index c34f7d8abfb..fe1ef948918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
-# Copyright © 2010 Intel Corporation
-# All Rights Reserved.
+# Copyright © 2012 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice (including the next
 # paragraph) shall be included in all copies or substantial portions of the
@@ -14,66 +13,70 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-# AUTHORS, COPYRIGHT HOLDERS, AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-# USE OR OTHER DEALINGS IN THE SOFTWARE.
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
 
-AUTOMAKE_OPTIONS = foreign
-AM_CPPFLAGS = -I mesa
+SUBDIRS = src
 
-SUBDIRS = glcpp
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-dri \
+	--enable-dri3 \
+	--enable-egl \
+	--enable-gallium-tests \
+	--enable-gallium-osmesa \
+	--enable-llvm \
+	--enable-gbm \
+	--enable-gles1 \
+	--enable-gles2 \
+	--enable-glx \
+	--enable-glx-tls \
+	--enable-nine \
+	--enable-opencl \
+	--enable-opengl \
+	--enable-va \
+	--enable-vdpau \
+	--enable-xa \
+	--enable-xvmc \
+	--enable-llvm-shared-libs \
+	--enable-libunwind \
+	--with-platforms=x11,wayland,drm,surfaceless \
+	--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
+	--with-gallium-drivers=i915,nouveau,r300,pl111,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,swr,etnaviv,imx \
+	--with-vulkan-drivers=intel,radeon
 
-bin_PROGRAMS = glsl
+ACLOCAL_AMFLAGS = -I m4
 
-glsl_LDADD = ./glcpp/libglcpp.la
-glsl_LDFLAGS = @LDFLAGS@ $(talloc_LIBS)
-glsl_SOURCES = \
-	main.cpp \
-	builtin_types.h \
-	symbol_table.c hash_table.c glsl_types.cpp \
-	glsl_parser.ypp glsl_lexer.lpp glsl_parser_extras.cpp \
-	ast_expr.cpp ast_to_hir.cpp ast_function.cpp ast_type.cpp \
-	ir.cpp hir_field_selection.cpp builtin_function.cpp \
-	ir_print_visitor.cpp ir_variable.cpp ir_function.cpp \
-	ir_basic_block.cpp \
-	ir_basic_block.h \
-	ir_clone.cpp \
-	ir_constant_expression.cpp \
-	ir_constant_folding.cpp \
-	ir_constant_variable.cpp \
-	ir_copy_propagation.cpp \
-	ir_copy_propagation.h \
-	ir_dead_code.cpp \
-	ir_dead_code.h \
-	ir_dead_code_local.cpp \
-	ir_expression_flattening.cpp \
-	ir_function_can_inline.cpp \
-	ir_function_inlining.cpp \
-	ir_if_simplification.cpp \
-	ir_optimization.h \
-	ir_reader.cpp s_expression.cpp \
-	ir_hv_accept.cpp \
-	ir_hierarchical_visitor.h \
-	ir_hierarchical_visitor.cpp \
-	ir_swizzle_swizzle.cpp \
-	ir_to_mesa.cpp \
-	ir_to_mesa.h \
-	ir_validate.cpp \
-	ir_vec_index_to_swizzle.cpp \
-	linker.cpp \
-	mesa/shader/prog_instruction.c \
-	mesa/shader/prog_instruction.h \
-	mesa/shader/prog_print.c \
-	mesa/shader/prog_print.h
+EXTRA_DIST = \
+	autogen.sh \
+	common.py \
+	docs \
+	doxygen \
+	bin/git_sha1_gen.py \
+	scons \
+	SConstruct \
+	build-support/conftest.dyn \
+	build-support/conftest.map
 
-BUILT_SOURCES = glsl_parser.h glsl_parser.cpp glsl_lexer.cpp
-CLEANFILES = $(BUILT_SOURCES)
+noinst_HEADERS = \
+	include/c99_alloca.h \
+	include/c99_compat.h \
+	include/c99_math.h \
+	include/c11 \
+	include/drm-uapi/drm.h \
+	include/drm-uapi/drm_fourcc.h \
+	include/drm-uapi/drm_mode.h \
+	include/drm-uapi/i915_drm.h \
+	include/drm-uapi/vc4_drm.h \
+	include/D3D9 \
+	include/GL/wglext.h \
+	include/HaikuGL \
+	include/no_extern_c.h \
+	include/pci_ids
 
-builtin_function.cpp: builtins/*/*
-	./builtins/tools/generate_builtins.pl > builtin_function.cpp
-glsl_parser.h: glsl_parser.cpp
-
-.lpp.cpp:
-	$(LEXCOMPILE) --outfile="$@" $<
+# We list some directories in EXTRA_DIST, but don't actually want to include
+# the .gitignore files in the tarball.
+dist-hook:
+	find $(distdir) -name .gitignore -exec $(RM) {} +