util: Fix build on old glibc.

[mesa.git] / src / util / Makefile.am

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e05a2c5958ca4c703feea66f768ea9d2962f8e11..4512dc99d5e1a7d436dd774f5e3d35035f776184 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,11 +19,13 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = . tests/hash_table
+SUBDIRS = xmlpool . tests/hash_table
 
 include Makefile.sources
 
-noinst_LTLIBRARIES = libmesautil.la
+noinst_LTLIBRARIES = \
+       libmesautil.la \
+       libxmlconfig.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include
@@ -36,15 +38,29 @@ libmesautil_la_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
-       $(SHA1_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2008_COMPAT_CFLAGS)
+       $(MSVC2013_COMPAT_CFLAGS) \
+       $(ZLIB_CFLAGS)
 
 libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \
        $(MESA_UTIL_GENERATED_FILES)
 
-libmesautil_la_LIBADD = $(SHA1_LIBS)
+libmesautil_la_LIBADD = \
+       $(CLOCK_LIB) \
+       $(ZLIB_LIBS)
+
+libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
+libxmlconfig_la_CFLAGS = \
+       $(DEFINES) \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
+       -DSYSCONFDIR=\"$(sysconfdir)\" \
+       $(VISIBILITY_CFLAGS) \
+       $(EXPAT_CFLAGS)
+libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
+
+sysconf_DATA = drirc
 
 roundeven_test_LDADD = -lm
 
@@ -53,7 +69,13 @@ TESTS = $(check_PROGRAMS)
 
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = format_srgb.py SConscript
+EXTRA_DIST = \
+       drirc \
+       format_srgb.py \
+       merge_driinfo.py \
+       SConscript \
+       xmlpool.h \
+       sha1/README
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)