X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=d41a087ae1c1cafc3f4a807a992fdd53180581e7;hb=584cb7a16f4c1ec1b20760247069c3634232bc8a;hp=7da91a254437aa5ae1e0d3214bc04d306cafda53;hpb=7af25d17a5956106c5319ba8cd7d947fbab76f6b;p=mesa.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 7da91a25443..d41a087ae1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,9 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = gtest util mapi
+AUTOMAKE_OPTIONS = subdir-objects
+
+SUBDIRS = . gtest util mapi/glapi/gen mapi
 
 if NEED_OPENGL_COMMON
 SUBDIRS += glsl mesa
@@ -32,7 +34,7 @@ SUBDIRS += glx
 endif
 
 if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland
+SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
 endif
 
 if HAVE_EGL_DRIVER_DRI2
@@ -48,15 +50,31 @@ SUBDIRS += egl/main
 endif
 
 if HAVE_GALLIUM
-SUBDIRS +=			\
-	gallium/auxiliary	\
-	gallium
-
-if HAVE_GALLIUM_TESTS
-SUBDIRS +=			\
-	gallium/tests/trivial	\
-	gallium/tests/unit
+SUBDIRS += gallium
 endif
+
+EXTRA_DIST = \
+	egl/drivers/haiku \
+	egl/docs \
+	getopt hgl SConscript
+
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+
+if HAVE_VULKAN
+SUBDIRS += vulkan
 endif
 
-EXTRA_DIST = getopt
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include/ \
+	-I$(top_srcdir)/src/mapi/ \
+	-I$(top_srcdir)/src/mesa/ \
+	$(DEFINES)
+
+noinst_LTLIBRARIES = libglsl_util.la
+
+libglsl_util_la_SOURCES = \
+	mesa/main/imports.c \
+	mesa/program/prog_hash_table.c \
+	mesa/program/symbol_table.c \
+	mesa/program/dummy_errors.c