# 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
endif
if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland
+SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
endif
if HAVE_EGL_DRIVER_DRI2
endif
if HAVE_GALLIUM
-SUBDIRS += \
- gallium/auxiliary \
- gallium
-
-if HAVE_GALLIUM_TESTS
-SUBDIRS += \
- gallium/tests/trivial \
- gallium/tests/unit
-endif
+SUBDIRS += gallium
endif
-EXTRA_DIST = getopt
+EXTRA_DIST = \
+ egl/drivers/haiku \
+ egl/docs \
+ getopt hgl SConscript
+
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+
+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