Signed-off-by: Eric Anholt <e...@anholt.net> --- .gitignore | 79 --------------------------------------------------------- Makefile.am | 43 ------------------------------- autogen.sh | 17 ------------- configure.ac | 29 --------------------- main.c | 6 ----- man/Makefile.am | 38 --------------------------- meson.build | 1 - 7 files changed, 213 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 man/Makefile.am
diff --git a/.gitignore b/.gitignore index 009669fbff0e..67020331ba6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,80 +1 @@ -# -# X.Org module default exclusion patterns -# The next section if for module specific patterns -# -# Do not edit the following section -# GNU Build System (Autotools) -aclocal.m4 -autom4te.cache/ -autoscan.log -ChangeLog -compile -config.guess -config.h -config.h.in -config.log -config-ml.in -config.py -config.status -config.status.lineno -config.sub -configure -configure.scan -depcomp -.deps/ -INSTALL -install-sh -.libs/ -libtool -libtool.m4 -ltmain.sh -lt~obsolete.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -Makefile -Makefile.in -mdate-sh -missing -mkinstalldirs -*.pc -py-compile -stamp-h? -symlink-tree -texinfo.tex -ylwrap - -# Do not edit the following section -# Edit Compile Debug Document Distribute -*~ -*.[0-9] -*.[0-9]x -*.bak -*.bin -core -*.dll -*.exe -*-ISO*.bdf -*-JIS*.bdf -*-KOI8*.bdf -*.kld -*.ko -*.ko.cmd -*.lai -*.l[oa] -*.[oa] -*.obj -*.patch -*.so -*.pcf.gz -*.pdb -*.tar.bz2 -*.tar.gz -# -# Add & Override patterns for rendercheck -# -# Edit the following section as needed -# For example, !report.pc overrides *.pc. See 'man gitignore' -# -rendercheck version.h diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index f77cb4f2a651..000000000000 --- a/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -SUBDIRS = man - -bin_PROGRAMS = rendercheck - -rendercheck_SOURCES = \ - main.c \ - ops.c \ - rendercheck.h \ - tests.c \ - t_blend.c \ - t_bug7366.c \ - t_composite.c \ - t_dstcoords.c \ - t_fill.c \ - t_gradient.c \ - t_gtk_argb_xbgr.c \ - t_libreoffice_xrgb.c \ - t_repeat.c \ - t_shmblend.c \ - t_srccoords.c \ - t_tsrccoords.c \ - t_tsrccoords2.c \ - t_triangles.c - -AM_CFLAGS = $(RC_CFLAGS) $(CWARNFLAGS) -AM_CPPFLAGS = -D_GNU_SOURCE -rendercheck_LDADD = $(RC_LIBS) - -MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = \ - doc/AddingNewTests \ - doc/TODO \ - autogen.sh - -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - $(CHANGELOG_CMD) - -dist-hook: ChangeLog INSTALL diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 5b20136d3e79..000000000000 --- a/autogen.sh +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh - -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd "$srcdir" - -autoreconf -v --install || exit 1 -cd "$ORIGDIR" || exit $? - -git config --local --get format.subjectPrefix || - git config --local format.subjectPrefix "PATCH rendercheck" - -if test -z "$NOCONFIGURE"; then - exec "$srcdir"/configure "$@" -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 2a427934d70c..000000000000 --- a/configure.ac +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.60) -AC_INIT([rendercheck], - [1.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [rendercheck]) - -AC_CONFIG_SRCDIR([Makefile.am]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) - -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS -XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-shadow]) - -# Checks for header files. -AC_CHECK_HEADERS([err.h]) - -# Checks for pkg-config packages -PKG_CHECK_MODULES(RC, [xrender xext x11 xproto >= 7.0.17]) - -AC_CONFIG_FILES([Makefile - man/Makefile]) - -AC_OUTPUT diff --git a/main.c b/main.c index 86346f031707..5ec80901ad51 100644 --- a/main.c +++ b/main.c @@ -26,9 +26,7 @@ #include <string.h> #include <strings.h> #include <getopt.h> -#ifdef HAVE_VERSION_H #include "version.h" -#endif bool is_verbose = false, minimalrendering = false; int enabled_tests = ~0; /* Enable all tests by default */ @@ -292,11 +290,7 @@ int main(int argc, char **argv) /* Print the version string. Bail out if --version was requested and * continue otherwise. */ -#ifdef HAVE_VERSION_H printf("rendercheck %s\n", VERSION); -#else - puts(PACKAGE_STRING); -#endif if (print_version) return 0; diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 84d1f9f73547..000000000000 --- a/man/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# -# 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. -# - -appmandir = $(APP_MAN_DIR) - -appman_PRE = rendercheck.man - -appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) - -EXTRA_DIST = $(appman_PRE) - -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/meson.build b/meson.build index bb4171d598c0..25b8e4381ec1 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,6 @@ if cc.has_header('err.h') endif add_project_arguments('-D_GNU_SOURCE', language: 'c') -add_project_arguments('-DHAVE_VERSION_H', language: 'c') srcs = [ 'main.c', -- 2.11.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel