X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=1eda3e581ae2e137b0ba2b5260e293b12d1ae37e;hb=91cc6fcbb050423823ff4262cf860a34d20f504e;hp=4193fe82ae448d5519e1174844d68becc18f920e;hpb=eeb56b6b438e5acc5e90d0981fb455ba90b1e01a;p=mesa.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 4193fe82ae4..1eda3e581ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,45 +19,135 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = gtest util mapi
+.PHONY: git_sha1.h
+git_sha1.h:
+	@echo "updating $@"
+	@$(PYTHON) $(top_srcdir)/bin/git_sha1_gen.py --output $@
 
-if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+BUILT_SOURCES = git_sha1.h
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = meson.build
+
+SUBDIRS = . gtest util mapi/glapi/gen mapi
+
+if HAVE_OPENGL
+gldir = $(includedir)/GL
+gl_HEADERS = \
+  $(top_srcdir)/include/GL/gl.h \
+  $(top_srcdir)/include/GL/glext.h \
+  $(top_srcdir)/include/GL/glcorearb.h \
+  $(top_srcdir)/include/GL/gl_mangle.h
 endif
 
-SUBDIRS += loader
+# TODO: When building with glvnd, glvnd itself should be providing gl.pc and the headers
+if HAVE_GLX
+glxdir = $(includedir)/GL
+glx_HEADERS = \
+  $(top_srcdir)/include/GL/glx.h \
+  $(top_srcdir)/include/GL/glxext.h \
+  $(top_srcdir)/include/GL/glx_mangle.h
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = mesa/gl.pc
+endif
 
-if HAVE_DRI_GLX
-SUBDIRS += glx
+if HAVE_COMMON_OSMESA
+osmesadir = $(includedir)/GL
+osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
+endif
+
+# include only conditionally ?
+SUBDIRS += compiler
+
+## Optionally required by EGL
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-drm
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland
+if HAVE_VULKAN_COMMON
+SUBDIRS += vulkan
 endif
 
-if HAVE_EGL_DRIVER_DRI2
-SUBDIRS += egl/drivers/dri2
+EXTRA_DIST += vulkan/registry/vk.xml
+
+if HAVE_AMD_DRIVERS
+SUBDIRS += amd
 endif
 
+if HAVE_INTEL_DRIVERS
+SUBDIRS += intel
+endif
+
+if HAVE_BROADCOM_DRIVERS
+SUBDIRS += broadcom
+endif
+
+if HAVE_FREEDRENO_DRIVERS
+SUBDIRS += freedreno
+endif
+
+if NEED_OPENGL_COMMON
+SUBDIRS += mesa
+endif
+
+SUBDIRS += loader
+
+if HAVE_DRI_GLX
+SUBDIRS += glx
+endif
+
+## Optionally required by EGL (aka PLATFORM_GBM)
 if HAVE_GBM
 SUBDIRS += gbm
 endif
 
 if HAVE_EGL
-SUBDIRS += egl/main
+SUBDIRS += egl
 endif
 
-if HAVE_GALLIUM
-SUBDIRS +=			\
-	gallium/auxiliary	\
-	gallium			\
-	gallium/targets
-
-if HAVE_GALLIUM_TESTS
-SUBDIRS +=			\
-	gallium/tests/trivial	\
-	gallium/tests/unit
+# Requires wayland-drm
+if HAVE_RADEON_VULKAN
+SUBDIRS += amd/vulkan
 endif
+
+if HAVE_GALLIUM
+SUBDIRS += gallium
 endif
 
-EXTRA_DIST = getopt
+EXTRA_DIST += \
+	getopt hgl SConscript \
+	$(top_srcdir)/include/GL/mesa_glinterop.h
+
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include/ \
+	-I$(top_srcdir)/src/mapi/ \
+	-I$(top_srcdir)/src/mesa/ \
+	-I$(top_srcdir)/src/gallium/include \
+	-I$(top_srcdir)/src/gallium/auxiliary \
+	$(DEFINES)
+
+noinst_LTLIBRARIES = libglsl_util.la
+
+libglsl_util_la_SOURCES = \
+	mesa/main/extensions_table.c \
+	mesa/main/imports.c \
+	mesa/program/prog_parameter.c \
+	mesa/program/symbol_table.c \
+	mesa/program/dummy_errors.c
+
+EXTRA_DIST += \
+	tools/imgui/imconfig.h \
+	tools/imgui/imgui.cpp \
+	tools/imgui/imgui.h \
+	tools/imgui/imgui_draw.cpp \
+	tools/imgui/imgui_demo.cpp \
+	tools/imgui/imgui_internal.h \
+	tools/imgui/imgui_memory_editor.h \
+	tools/imgui/stb_rect_pack.h \
+	tools/imgui/stb_textedit.h \
+	tools/imgui/stb_truetype.h \
+	tools/imgui/README \
+	tools/imgui/LICENSE.txt \
+	tools/imgui/meson.build