diff options
author | Dylan Baker <[email protected]> | 2019-04-08 12:44:17 -0700 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2019-04-15 13:44:29 -0700 |
commit | 95aefc94a941701616fda0776a3bd15710c8c151 (patch) | |
tree | bced9cf424ee7eb0cf753503eaace7cec4f62b50 /src/util | |
parent | de0c97c8171f8a8183b94d8ac6997117c4671da8 (diff) |
Delete autotools
Acked-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Acked-by: Marek Olšák <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Acked-by: Bas Nieuwenhuizen <[email protected]>
Acked-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Makefile.am | 101 | ||||
-rw-r--r-- | src/util/tests/fast_idiv_by_const/Makefile.am | 43 | ||||
-rw-r--r-- | src/util/tests/hash_table/Makefile.am | 48 | ||||
-rw-r--r-- | src/util/tests/set/Makefile.am | 42 | ||||
-rw-r--r-- | src/util/tests/string_buffer/Makefile.am | 42 | ||||
-rw-r--r-- | src/util/tests/vma/Makefile.am | 39 | ||||
-rw-r--r-- | src/util/xmlpool/Makefile.am | 110 |
7 files changed, 0 insertions, 425 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am deleted file mode 100644 index 4bda54c551d..00000000000 --- a/src/util/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright © 2014 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -SUBDIRS = . \ - xmlpool \ - tests/fast_idiv_by_const \ - tests/hash_table \ - tests/string_buffer \ - tests/set - -if HAVE_STD_CXX11 -SUBDIRS += tests/vma -endif - -include Makefile.sources - -noinst_LTLIBRARIES = \ - libmesautil.la \ - libxmlconfig.la - -AM_CPPFLAGS = \ - $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/include - -libmesautil_la_CPPFLAGS = \ - $(DEFINES) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - $(VISIBILITY_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) \ - $(ZLIB_CFLAGS) - -libmesautil_la_SOURCES = \ - $(MESA_UTIL_FILES) \ - $(MESA_UTIL_GENERATED_FILES) - -libmesautil_la_LIBADD = \ - $(PTHREAD_LIBS) \ - $(CLOCK_LIB) \ - $(ZLIB_LIBS) \ - $(LIBATOMIC_LIBS) \ - -lm - -libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES) -libxmlconfig_la_CFLAGS = \ - $(DEFINES) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DDATADIR=\"$(datadir)\" \ - $(VISIBILITY_CFLAGS) \ - $(EXPAT_CFLAGS) -libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm - -drircdir = $(datadir)/drirc.d -drirc_DATA = 00-mesa-defaults.conf - -u_atomic_test_LDADD = libmesautil.la -roundeven_test_LDADD = -lm -mesa_sha1_test_LDADD = libmesautil.la - -check_PROGRAMS = u_atomic_test roundeven_test mesa-sha1_test -TESTS = $(check_PROGRAMS) - -BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = \ - 00-mesa-defaults.conf \ - format_srgb.py \ - merge_driinfo.py \ - SConscript \ - xmlpool.h \ - sha1/README \ - meson.build - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -format_srgb.c: format_srgb.py - $(PYTHON_GEN) $(srcdir)/format_srgb.py > $@ diff --git a/src/util/tests/fast_idiv_by_const/Makefile.am b/src/util/tests/fast_idiv_by_const/Makefile.am deleted file mode 100644 index 1ebee09f59b..00000000000 --- a/src/util/tests/fast_idiv_by_const/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright © 2018 Intel -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gtest/include \ - $(PTHREAD_CFLAGS) \ - $(DEFINES) - -TESTS = fast_idiv_by_const_test - -check_PROGRAMS = $(TESTS) - -fast_idiv_by_const_test_SOURCES = \ - fast_idiv_by_const_test.cpp - -fast_idiv_by_const_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/hash_table/Makefile.am b/src/util/tests/hash_table/Makefile.am deleted file mode 100644 index 526454cb1ed..00000000000 --- a/src/util/tests/hash_table/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright © 2009 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/util \ - $(DEFINES) - -LDADD = \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -TESTS = \ - clear \ - collision \ - delete_and_lookup \ - delete_management \ - destroy_callback \ - insert_and_lookup \ - insert_many \ - null_destroy \ - random_entry \ - remove_key \ - remove_null \ - replacement \ - $() - -check_PROGRAMS = $(TESTS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/set/Makefile.am b/src/util/tests/set/Makefile.am deleted file mode 100644 index 5529f4c144a..00000000000 --- a/src/util/tests/set/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2018 Intel -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gtest/include \ - $(PTHREAD_CFLAGS) \ - $(DEFINES) - -TESTS = set_test - -check_PROGRAMS = $(TESTS) - -set_test_SOURCES = \ - set_test.cpp - -set_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/string_buffer/Makefile.am b/src/util/tests/string_buffer/Makefile.am deleted file mode 100644 index 8bc8a9c9b6c..00000000000 --- a/src/util/tests/string_buffer/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2017 Thomas Helland -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gtest/include \ - $(PTHREAD_CFLAGS) \ - $(DEFINES) - -TESTS = string_buffer_test - -check_PROGRAMS = $(TESTS) - -string_buffer_test_SOURCES = \ - string_buffer_test.cpp - -string_buffer_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/vma/Makefile.am b/src/util/tests/vma/Makefile.am deleted file mode 100644 index b9ca8f5977a..00000000000 --- a/src/util/tests/vma/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2018 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/util \ - $(DEFINES) - -TESTS = vma_random_test - -check_PROGRAMS = $(TESTS) - -vma_random_test_SOURCES = \ - vma_random_test.cpp - -vma_random_test_LDADD = \ - $(top_builddir)/src/util/libmesautil.la - -vma_random_test_CXXFLAGS = $(CXX11_CXXFLAGS) - -EXTRA_DIST = meson.build diff --git a/src/util/xmlpool/Makefile.am b/src/util/xmlpool/Makefile.am deleted file mode 100644 index 2b01391401b..00000000000 --- a/src/util/xmlpool/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -# Convenient makefile for managing translations. - -# Prerequisites: -# - GNU gettext -# - Python - -# Adding new translations -# ----------------------- - -# To start working on a new translation edit the POS=... line -# below. If you want to add for example a french translation, add -# fr.po. - -# Then run "make po" to generate a fresh .po file from translatable -# strings in t_options.h. Now you can edit the new .po file (fr.po in -# the example above) to translate the strings. Please make sure that -# your editor encodes the file in UTF-8. - -# Updating existing translations -# ------------------------------ - -# Run "make po" to update .po files with new translatable strings from -# t_options.h. Now you can edit the .po files you're interested -# in. Please make sure that your editor encodes the file in UTF-8. - -# Updating options.h -# ------------------ - -# Finally run "make" to generate options.h from t_options.h with all -# translations. Now you can rebuild the drivers. Any common options -# used by the drivers will have option descriptions with the latest -# translations. - -# Publishing translations -# ----------------------- - -# To get your translation(s) into Mesa CVS, please send me your -# <lang>.po file. - -# More information: -# - info gettext - -# The set of supported languages. Add languages as needed. -POS=ca.po de.po es.po nl.po fr.po sv.po - -# -# Don't change anything below, unless you know what you're doing. -# -LANGS=$(POS:%.po=%) -MOS=$(POS:%.po=%.gmo) -POT=xmlpool.pot - -.PHONY: all clean clean-local pot po mo - -EXTRA_DIST = \ - gen_xmlpool.py \ - options.h \ - t_options.h \ - $(POS) \ - $(MOS) \ - SConscript \ - meson.build \ - LINGUAS \ - POTFILES - -BUILT_SOURCES = options.h -CLEANFILES = \ - options.h - $(POS) \ - $(MOS) - -clean-local: - rm -f $(MOS) - -# Default target options.h -LOCALEDIR := . -options.h: t_options.h $(MOS) - $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \ - --template $(srcdir)/t_options.h \ - --output options.h \ - --localedir $(LOCALEDIR) \ - --languages $(LANGS) - -# Update .mo files from the corresponding .po files. -%.gmo: %.po - @mo="$@"; \ - lang=$${mo%%/*}; \ - echo "Updating ($$lang) $@ from $?."; \ - msgfmt -o $@ $? - -# Use this target to create or update .po files with new messages in -# driconf.py. -po: $(POT) - @for po in $(POS); do \ - if [ -f $$po ]; then \ - echo "Merging new strings from $(POT) into $@."; \ - mv $$po $$po~; \ - msgmerge -o $$po $$po~ $(POT); \ - else \ - echo "Initializing $$po from $(POT)."; \ - msginit -i $(POT) -o $$po~ --locale=$*; \ - sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $$po~ > $$po; \ - fi \ - done - -pot: $(POT) - -# Extract message catalog from driconf.py. -$(POT): t_options.h - xgettext -L C --from-code utf-8 -o $(POT) t_options.h |