diff options
| author | Nicolai Hähnle <[email protected]> | 2017-06-30 11:57:06 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-07-31 15:38:41 +0200 |
| commit | 601093f95ddf6b49a79baa91dc51d4f163dfc8de (patch) | |
| tree | 79cc7388e4d4de45d226852368ffcc813098b577 /src/util/Makefile.am | |
| parent | 1e40d2c8820e2045fbfed387a93a486c8b1c94fd (diff) | |
xmlconfig: move into src/util
v2: attempt to fix Android build (Emil)
v3: add missing include path
Reviewed-by: Marek Olšák <[email protected]> (v1)
Diffstat (limited to 'src/util/Makefile.am')
| -rw-r--r-- | src/util/Makefile.am | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index f094eb4a0d0..fa6551eaa56 100644 --- 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 @@ -46,6 +48,18 @@ libmesautil_la_SOURCES = \ libmesautil_la_LIBADD = $(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 check_PROGRAMS = u_atomic_test roundeven_test @@ -54,8 +68,10 @@ TESTS = $(check_PROGRAMS) BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ + drirc \ format_srgb.py \ SConscript \ + xmlpool.h \ sha1/README PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) |