X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=18cb4ce76d7da8f106fbeeb569b43f1dc6bb060f;hb=5a7f04925f60a0222c66de8e3e4e788a0a550d5b;hp=85b75a93b5eedc26cb012945b45ae97a0735061a;hpb=952b324b23b1ff8596e3cb168c16a1feb372b32b;p=mesa.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 85b75a93b5e..18cb4ce76d7 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/glapi/gen mapi
+AUTOMAKE_OPTIONS = subdir-objects
+
+SUBDIRS = . gtest util mapi/glapi/gen mapi
 
 if NEED_OPENGL_COMMON
 SUBDIRS += glsl mesa
@@ -51,4 +53,23 @@ if HAVE_GALLIUM
 SUBDIRS += gallium
 endif
 
-EXTRA_DIST = egl/docs getopt hgl SConscript
+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