diff options
author | Iñigo Martínez <inigomartinez@gmail.com> | 2017-08-05 18:24:50 +0200 |
---|---|---|
committer | Iñigo Martínez <inigomartinez@gmail.com> | 2017-08-05 18:28:09 +0200 |
commit | b34f0fab582a90d33a9dabe9c48b9f203272d22f (patch) | |
tree | a75af02144fb9a0beb5e15da8532fe824b128ca6 | |
parent | cae744c3d31a6bbff4c85ec0cacb42c976f0e6a3 (diff) | |
download | vte-wip/inigomartinez/meson.tar.gz |
build: Remove autotoolswip/inigomartinez/meson
-rw-r--r-- | Makefile.am | 49 | ||||
-rwxr-xr-x | autogen.sh | 16 | ||||
-rw-r--r-- | bindings/Makefile.am | 13 | ||||
-rw-r--r-- | bindings/gir/Makefile.am | 34 | ||||
-rw-r--r-- | bindings/vala/Makefile.am | 99 | ||||
-rw-r--r-- | configure.ac | 495 | ||||
-rw-r--r-- | doc/Makefile.am | 12 | ||||
-rw-r--r-- | doc/openi18n/Makefile.am | 7 | ||||
-rw-r--r-- | doc/reference/Makefile.am | 157 | ||||
-rw-r--r-- | git.mk | 333 | ||||
-rw-r--r-- | glade/Makefile.am | 44 | ||||
-rw-r--r-- | m4/attributes.m4 | 289 | ||||
-rw-r--r-- | m4/ax_cxx_compile_stdcxx.m4 | 982 | ||||
-rw-r--r-- | perf/Makefile.am | 12 | ||||
-rw-r--r-- | src/Makefile.am | 401 | ||||
-rw-r--r-- | vte.pc.in | 11 |
16 files changed, 0 insertions, 2954 deletions
diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 5e88338e..00000000 --- a/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -NULL = - -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = src bindings po doc perf - -EXTRA_DIST = \ - HACKING \ - autogen.sh \ - ChangeLog.pre-git \ - meson.build \ - meson_options.txt \ - po/meson.build \ - $(NULL) - -DISTCLEANFILES = - -if ENABLE_GLADE_CATALOGUE -SUBDIRS += glade -endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = vte-$(VTE_API_VERSION).pc - -DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ - --enable-introspection \ - --disable-vala \ - --disable-test-application \ - --disable-silent-rules \ - --with-gtk=$(GTK_API_VERSION) - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ - $(NULL) - -# Build ChangeLog from GIT history -ChangeLog: - $(AM_V_GEN) if test -d $(top_srcdir)/.git; then \ - GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \ - fi - -dist: ChangeLog - -.PHONY: ChangeLog - --include $(top_srcdir)/git.mk diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 1e312d0f..00000000 --- a/autogen.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -set -e - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -cd "$srcdir" -mkdir -p m4 >/dev/null 2>&1 || true -gtkdocize --copy --flavour no-tmpl -autoreconf --verbose --force --install -intltoolize --force -cd - - -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/bindings/Makefile.am b/bindings/Makefile.am deleted file mode 100644 index 3b149f3d..00000000 --- a/bindings/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -SUBDIRS = - -if HAVE_INTROSPECTION -SUBDIRS += gir -endif - -if ENABLE_VAPIGEN -SUBDIRS += vala -endif - -.DELETE_ON_ERROR: - --include $(top_srcdir)/git.mk diff --git a/bindings/gir/Makefile.am b/bindings/gir/Makefile.am deleted file mode 100644 index bd5efe7c..00000000 --- a/bindings/gir/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -CLEANFILES = -DISTCLEANFILES = -EXTRA_DIST = meson.build - -INTROSPECTION_GIRS = Vte-$(VTE_API_VERSION).gir -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -Vte-@VTE_API_VERSION@.gir: $(top_builddir)/src/libvte-$(VTE_API_VERSION).la -Vte_@VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION) -Vte_@VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(top_builddir)/src/vte -I$(top_srcdir)/src/vte -Vte_@VTE_API_VERSION_U@_gir_LIBS = $(top_builddir)/src/libvte-$(VTE_API_VERSION).la -Vte_@VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION) -Vte_@VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h" -Vte_@VTE_API_VERSION_U@_gir_FILES = \ - $(wildcard $(top_srcdir)/src/vte/*.h) \ - $(wildcard $(top_builddir)/src/vte/*.h) \ - $(top_srcdir)/src/pty.cc \ - $(top_srcdir)/src/vtegtk.cc \ - $(top_builddir)/src/vtetypebuiltins.cc \ - $(NULL) - -girdir = $(datadir)/gir-1.0 -nodist_gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA) - -.DELETE_ON_ERROR: - -include $(INTROSPECTION_MAKEFILE) --include $(top_srcdir)/git.mk diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am deleted file mode 100644 index a484fb03..00000000 --- a/bindings/vala/Makefile.am +++ /dev/null @@ -1,99 +0,0 @@ -if ENABLE_TEST_APPLICATION -bin_PROGRAMS = vte-@VTE_API_MAJOR_VERSION@.@VTE_API_MINOR_VERSION@ -else -noinst_PROGRAMS = vte-@VTE_API_MAJOR_VERSION@.@VTE_API_MINOR_VERSION@ -endif - -CLEANFILES = -DISTCLEANFILES = -EXTRA_DIST = meson.build - -# VAPI - -VAPIGEN_VAPIS = vte-$(VTE_API_VERSION).vapi - -vte-@VTE_API_VERSION@.vapi: $(top_builddir)/bindings/gir/Vte-$(VTE_API_VERSION).gir -vte_@VTE_API_VERSION_U@_vapi_DEPS = \ - glib-2.0 \ - gio-2.0 \ - pango \ - gdk-$(GTK_API_VERSION) \ - gtk+-$(GTK_API_VERSION) \ - $(NULL) -vte_@VTE_API_VERSION_U@_vapi_METADATADIRS = $(srcdir) -vte_@VTE_API_VERSION_U@_vapi_FILES = $(top_builddir)/bindings/gir/Vte-$(VTE_API_VERSION).gir - -vapidir = $(datadir)/vala/vapi -nodist_vapi_DATA = $(VAPIGEN_VAPIS) - -CLEANFILES += $(nodist_vapi_DATA) - -# VALA Test application - -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_SOURCES = \ - app.vala \ - config.vapi \ - $(builddir)/vte-$(VTE_API_VERSION).vapi \ - $(NULL) - -nodist_vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_SOURCES = \ - appresources.c \ - $(NULL) - -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS = \ - --target-glib=2.38 \ - --pkg=posix \ - --pkg=gio-2.0 \ - --pkg=gtk+-$(GTK_API_VERSION) \ - --gresources app.gresource.xml \ - $(AM_VALAFLAGS) - -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/vte \ - -I$(top_builddir)/src/vte \ - $(AM_CPPFLAGS) \ - $(NULL) - -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CFLAGS = \ - -Wno-unused-variable \ - -Wno-unused-but-set-variable \ - $(VTE_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(NULL) - -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDADD = \ - $(top_builddir)/src/libvte-$(VTE_API_VERSION).la \ - $(VTE_LIBS) \ - $(NULL) - -if HAVE_VALA_0_31 -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS += --disable-since-check -endif - -if HAVE_GTK_3_16 -vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_VALAFLAGS += -D GTK_3_16 -endif - -CLEANFILES += \ - app.c \ - appresources.c \ - $(NULL) - -EXTRA_DIST += \ - app.gresource.xml \ - app.ui \ - search-popover.ui \ - $(NULL) - -appresources.c: app.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/app.gresource.xml) - $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name app $< - -.DELETE_ON_ERROR: - -include $(VAPIGEN_MAKEFILE) --include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac deleted file mode 100644 index b5e3f6db..00000000 --- a/configure.ac +++ /dev/null @@ -1,495 +0,0 @@ -m4_define([version_major],0) -m4_define([version_minor],49) -m4_define([version_micro],2) -m4_define([version_triplet],version_major.version_minor.version_micro) - -AC_PREREQ([2.63]) -AC_INIT([vte], - [version_triplet], - [http://bugzilla.gnome.org/enter_bug.cgi?product=vte], - [vte]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/vteapp.c]) -AC_CONFIG_HEADERS([config.h]) - -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 -Wno-portability]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -if test -z "$enable_maintainer_mode"; then - enable_maintainer_mode=yes -fi -AM_MAINTAINER_MODE([enable]) - -################################################################################ -# GTK+ -################################################################################ - -AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=3.0|3.90],[which gtk+ version to compile against (default: 3.0)])], - [case "$with_gtk" in - 3.0) ;; - 3.9[02468]) ;; - 2.0) AC_MSG_ERROR([unsupported gtk version $with_gtk specified]) ;; - *) AC_MSG_ERROR([invalid gtk version $with_gtk specified]) ;; - esac], - [with_gtk=3.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 3.0) GTK_API_VERSION=3.0 - GTK_API_MAJOR_VERSION=3 - GTK_API_MINOR_VERSION=0 - GTK_REQUIRED=3.8.0 - GTK_MIN_REQUIRED=3.8 - GTK_MAX_ALLOWED=3.20 - VTE_API_MAJOR_VERSION=2 - VTE_API_MINOR_VERSION=91 - GLADE_API_VERSION=2.0 - ;; - 3.9[02468]) GTK_API_VERSION=4.0 - GTK_API_MAJOR_VERSION=4 - GTK_API_MINOR_VERSION=0 - GTK_REQUIRED=3.89.0 - GTK_MIN_REQUIRED=3.8 - GTK_MAX_ALLOWED=3.20 - VTE_API_MAJOR_VERSION=3 - VTE_API_MINOR_VERSION=91 - # GLADE_API_VERSION=4.0 ? - # remove the following when they're ready - enable_glade_catalogue=no - enable_introspection=no - enable_vala=no - enable_test_application=no - ;; -esac - -VTE_API_VERSION=$VTE_API_MAJOR_VERSION.$VTE_API_MINOR_VERSION - -AC_SUBST([VTE_API_VERSION]) -AC_SUBST([VTE_API_VERSION_U],[AS_TR_SH([$VTE_API_VERSION])]) -AC_SUBST([VTE_API_MAJOR_VERSION]) -AC_SUBST([VTE_API_MINOR_VERSION]) -AC_SUBST([GTK_API_VERSION]) -AC_SUBST([GTK_API_MAJOR_VERSION]) -AC_SUBST([GTK_API_MINOR_VERSION]) - -################################################################################ -# Libtool versioning -################################################################################ -m4_define([lt_revision], m4_if(m4_eval(version_minor%2),1,0,version_micro)) -m4_define([lt_age], m4_eval(version_minor*100+version_micro-lt_revision)) -m4_define([lt_current], m4_eval(version_major+lt_age)) -m4_define([lt_triplet],lt_current:lt_revision:lt_age) - -LT_VERSION_INFO="lt_triplet()" -AC_SUBST([LT_VERSION_INFO]) - -################################################################################ - -# Check for programs -PKG_PROG_PKG_CONFIG -AC_PROG_CC -AC_PROG_CXX -AC_USE_SYSTEM_EXTENSIONS -AC_HEADER_STDC -AM_PROG_CC_C_O -AC_PROG_SED - -AX_CXX_COMPILE_STDCXX([11]) - -AC_SYS_LARGEFILE - -# Initialize libtool -LT_PREREQ([2.2]) -LT_INIT -LT_LANG([C]) -LT_LANG([C++]) - -AM_CONDITIONAL([HAVE_GCC],[test "$GCC" = "yes"]) -AM_CONDITIONAL([HAVE_GXX],[test "$GXX" = "yes"]) - -################################################################################ -# Enable debugging messages and additional run-time checks. -################################################################################ - -AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], - [enable extra debugging checks and logging messages])], - [],[enable_debug=no]) -if test "x$enable_debug" = "xyes" ; then - AC_MSG_RESULT([enabling debug checks and messages]) - AC_DEFINE(VTE_DEBUG,1,[Enable debugging messages.]) -fi - -################################################################################ -# i18n -################################################################################ - -IT_PROG_INTLTOOL([0.35.0]) - -GETTEXT_PACKAGE=vte-$VTE_API_VERSION -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", - [Package translatable messages domain name.]) -AM_GLIB_GNU_GETTEXT -AC_CHECK_DECLS(bind_textdomain_codeset,,,[#include "libintl.h"]) - -################################################################################ -# Compilation -################################################################################ - -m4_define([compiler_flags_common],[ dnl - -pipe dnl - -Wall dnl - -Wcast-align dnl - -Wendif-labels dnl - -Werror=declaration-after-statement dnl - "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security" dnl - -Werror=implicit-function-declaration dnl - -Werror=init-self dnl - -Werror=missing-include-dirs dnl - -Werror=missing-prototypes dnl - -Werror=pointer-arith dnl - -Wextra dnl - -Wfloat-equal dnl - -Wlogical-op dnl - -Wmisleading-indentation dnl - -Wmissing-declarations dnl - -Wmissing-include-dirs dnl - -Wmissing-format-attribute dnl - -Wmissing-noreturn dnl - -Wno-missing-field-initializers dnl - -Wno-switch-enum dnl - -Wno-unused-parameter dnl - -Wno-packed dnl - -Wshadow dnl - -Wsign-compare dnl - -Wstrict-aliasing=2 dnl - -Wundef dnl - -Wuninitialized dnl - -Wunsafe-loop-optimizations dnl - -Wwrite-strings dnl - -fno-common dnl - -fdiagnostics-show-option dnl - -fno-strict-aliasing dnl - -fstack-protector dnl - -fstack-protector-strong dnl - -fno-semantic-interposition dnl - -Wno-deprecated-declarations dnl -]) - -m4_define([compiler_flags_only_c],[ dnl - -Waggregate-return dnl - -Wimplicit dnl - -Wnested-externs dnl - -Wold-style-definition dnl - -Wstrict-prototypes dnl -]) - -m4_define([compiler_flags_only_cxx],[ dnl - -Wstrict-null-sentinel dnl - -fno-rtti dnl - -fno-exceptions dnl - -fvisibility=hidden dnl - -fvisibility-inlines-hidden dnl -]) - -CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[compiler_flags_common compiler_flags_only_c]) - -AC_LANG_PUSH([C++]) -CC_CHECK_FLAGS_APPEND([AM_CXXFLAGS],[CXXFLAGS],[compiler_flags_common compiler_flags_only_cxx]) -AC_LANG_POP([C++]) - -if test "$cc_cv_cxx_CXXFLAGS__fvisibility_hidden" != "yes"; then - AC_MSG_ERROR([$CXX doesn't support required flag -fvisibility=hidden]) -fi - -########################################################## -# Check for -Bsymbolic-functions linker flag used to avoid -# intra-library PLT jumps, if available. -########################################################## - -AC_ARG_ENABLE([Bsymbolic], - [AS_HELP_STRING([--disable-Bsymbolic], - [disable linking with -Bsymbolic])], - [],[enable_Bsymbolic=yes]) - -VTE_LDFLAGS= -if test "$enable_Bsymbolic" != "no"; then - CC_CHECK_LDFLAGS(["-Wl,-Bsymbolic-functions"], - [VTE_LDFLAGS="$VTE_LDFLAGS -Wl,-Bsymbolic-functions"], - [if test "$enable_Bsymbolic" = "auto"; then - AC_MSG_WARN([-Bsymbolic not supported by ld; disabling]) - enable_Bsymbolic=no - else - AC_MSG_ERROR([-Bsymbolic requested but not supported by ld. Use --disable-Bsymbolic to disable]) - fi]) - - AC_LANG_PUSH([C++]) - CC_CHECK_LDFLAGS(["-Wl,-Bsymbolic-functions"], - [VTE_CXXLDFLAGS="$VTE_CXXLDFLAGS -Wl,-Bsymbolic-functions"], - [if test "$enable_Bsymbolic" = "auto"; then - AC_MSG_WARN([-Bsymbolic not supported by cxx ld; disabling]) - enable_Bsymbolic=no - else - AC_MSG_ERROR([-Bsymbolic requested but not supported by cxx ld. Use --disable-Bsymbolic to disable]) - fi]) - AC_LANG_POP([C++]) -fi - -AC_SUBST([VTE_LDFLAGS]) -AC_SUBST([VTE_CXXLDFLAGS]) - -################################################################################ -# Core -################################################################################ - -GLIB_REQUIRED=2.40.0 -GIO_REQUIRED=2.40.0 -PANGO_REQUIRED=1.22.0 -GNUTLS_REQUIRED=3.2.7 -PCRE2_REQUIRED=10.21 - -# GNUTLS - -AC_MSG_CHECKING([whether gnutls support is requested]) -AC_ARG_WITH([gnutls], - [AS_HELP_STRING([--without-gnutls],[Disable gnutls support])], - [],[with_gnutls=yes]) -AC_MSG_RESULT([$with_gnutls]) - -GNUTLS_PKGS= -if test "$with_gnutls" = "yes"; then - GNUTLS_PKGS="gnutls >= $GNUTLS_REQUIRED" - - AC_DEFINE([WITH_GNUTLS],[1],[Define to 1 to enable gnutls support]) -fi - -AM_CONDITIONAL([WITH_GNUTLS],[test "$with_gnutls" = "yes"]) - -# GLIB tools - -AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) - -VTE_DEFAULT_TERM=xterm-256color -AC_DEFINE_UNQUOTED(VTE_DEFAULT_TERM,"$VTE_DEFAULT_TERM",[The default value $TERM is set to.]) - -# Check for headers. -AC_CHECK_HEADERS([sys/select.h sys/syslimits.h sys/termios.h sys/wait.h stropts.h termios.h util.h wchar.h pty.h]) -AC_HEADER_TIOCGWINSZ - -# Check for how to open a new PTY. We support posix_openpt and BSDs openpty - -AC_CHECK_FUNCS([posix_openpt grantpt unlockpt ptsname],[], - [AC_MSG_ERROR([no support for Unix98 PTY found])]) - -# Misc PTY handling functions -AC_CHECK_FUNCS([cfmakeraw fork setsid setpgid getpgid tcgetattr tcsetattr]) - -# Misc I/O routines. -AC_CHECK_FUNCS([pread pwrite]) -AC_CHECK_FUNCS([explicit_bzero]) - -# for vtespawn -AC_CHECK_HEADERS([sys/resource.h]) -AC_CHECK_FUNCS([fdwalk]) - -# Math functions -AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) -AC_CHECK_FUNCS([ceil floor round]) - -# Search for the required modules. - -VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gobject-2.0 gio-2.0 gio-unix-2.0 zlib libpcre2-8 >= $PCRE2_REQUIRED $GNUTLS_PKGS" -PKG_CHECK_MODULES([VTE],[$VTE_PKGS]) -AC_SUBST([VTE_PKGS]) - -PKG_CHECK_MODULES([GLIB],[glib-2.0 >= $GLIB_REQUIRED]) -PKG_CHECK_MODULES([GOBJECT],[gobject-2.0]) -PKG_CHECK_MODULES([GTK],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED]) - -wcs_funcs_includes=" -#ifdef HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include <memory.h> -# endif -# include <string.h> -#else -# ifdef HAVE_STRINGS_H -# include <strings.h> -# endif -#endif -#ifdef HAVE_WCHAR_H -# include <wchar.h> -#endif -" - -AC_CHECK_TYPES(wint_t, AC_DEFINE(HAVE_WINT_T, , [Defined when the wint_t type is supported]), ,$wcs_funcs_includes) - -################################################################################ -# Glade catalogue -################################################################################ - -AC_MSG_CHECKING([whether to install the glade catalogue]) -AC_ARG_ENABLE([glade-catalogue], - [AS_HELP_STRING([--disable-glade],[Disable installing the glade catalogue])], - [],[enable_glade_catalogue=no]) -AC_MSG_RESULT([$enable_glade_catalogue]) - -if test "$enable_glade_catalogue" = "yes"; then - GLADE_CATALOGUE_DIR="$($PKG_CONFIG --variable=catalogdir gladeui-$GLADE_API_VERSION)" - GLADE_ICON_DIR="$($PKG_CONFIG --variable=pixmapdir gladeui-$GLADE_API_VERSION)" - GLADE_MODULE_DIR="$($PKG_CONFIG --variable=moduledir gladeui-$GLADE_API_VERSION)" - - if test -z "$GLADE_CATALOGUE_DIR" -o -z "$GLADE_MODULE_DIR"; then - AC_MSG_ERROR([gladeui-$GLADE_API_VERSION not found]) - fi - - AC_SUBST([GLADE_CATALOGUE_DIR]) - AC_SUBST([GLADE_ICON_DIR]) - AC_SUBST([GLADE_MODULE_DIR]) -fi - -AM_CONDITIONAL([ENABLE_GLADE_CATALOGUE],[test "$enable_glade_catalogue" = "yes"]) - -# ******** -# Bindings -# ******** - -# No automagic please! -if test -z "$enable_introspection"; then - enable_introspection=yes -fi - -m4_ifdef([GOBJECT_INTROSPECTION_CHECK], - [GOBJECT_INTROSPECTION_CHECK([0.9.0])], - [if test "$enable_introspection" = "yes"; then - AC_MSG_ERROR([[Introspection requested but M4 macros not installed. Try --disable-introspection]]) - fi - AM_CONDITIONAL([HAVE_INTROSPECTION],[false])]) - -# No automagic please! -if test -z "$enable_vala"; then - enable_vala=yes -fi - -m4_ifdef([VAPIGEN_CHECK], - [VAPIGEN_CHECK([0.24])], - [if test "$enable_vala" = "yes"; then - AC_MSG_ERROR([[Vala requested but M4 macros not installed. Try --disable-vala]]) - fi - AM_CONDITIONAL([ENABLE_VAPIGEN],[false])]) - -# **************** -# Test Application -# **************** - -AC_MSG_CHECKING([whether to install the vala test application]) -AC_ARG_ENABLE([test-application], - [AS_HELP_STRING([--disable-test-application],[Disable installing the vala test application])], - [],[enable_test_application=$enable_vala]) -AC_MSG_RESULT([$enable_test_application]) - -AM_PROG_VALAC([0.24.0],[],[ - if test "$enable_vala" != "no"; then - AC_MSG_ERROR([Vala requested but vala compiler >= 0.24.0 not found]) - fi]) - -PKG_CHECK_MODULES([GTK_3_16],[gtk+-$GTK_API_VERSION >= 3.16],[have_gtk_3_16=yes],[have_gtk_3_16=no]) -AM_PROG_VALAC([0.31.1],[have_vala_0_31=yes],[have_vala_0_31=no]) - -AM_CONDITIONAL([ENABLE_TEST_APPLICATION],[test "$enable_test_application" = "yes"]) -AM_CONDITIONAL([HAVE_GTK_3_16],[test "$have_gtk_3_16" = "yes"]) -AM_CONDITIONAL([HAVE_VALA_0_31],[test "$have_vala_0_31" = "yes"]) - -# *************** -# Auxiliary tools -# *************** - -AC_ARG_VAR([GLIB_COMPILE_RESOURCES],[the glib-compile-resources programme]) -if test -z "$GLIB_COMPILE_RESOURCES"; then - AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources],[]) - if test -z "$GLIB_COMPILE_RESOURCES"; then - AC_MSG_ERROR([glib-compile-resources not found]) - fi -fi - -AC_ARG_VAR([GPERF],[the gperf programme]) -if test -z "$GPERF"; then - AC_PATH_PROG([GPERF],[gperf],[]) - if test -z "$GPERF"; then - AC_MSG_ERROR([gperf not found]) - fi -fi - -AC_ARG_VAR([XMLLINT],[the xmllint programme]) -if test -z "$XMLLINT"; then - AC_PATH_PROG([XMLLINT],[xmllint],[]) - if test -z "$XMLLINT"; then - AC_MSG_ERROR([xmllint not found]) - fi -fi - -################################################################################ - -GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) - -AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)]) -AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-$GTK_API_VERSION)]) - -################################################################################ - -AC_SUBST([VTE_MAJOR_VERSION],[version_major]) -AC_SUBST([VTE_MINOR_VERSION],[version_minor]) -AC_SUBST([VTE_MICRO_VERSION],[version_micro]) - -AC_SUBST([AM_CPPFLAGS]) -AC_SUBST([AM_CFLAGS]) -AC_SUBST([AM_CXXFLAGS]) -AC_SUBST([AM_LDFLAGS]) - -################################################################################ - -AC_CONFIG_FILES([ -Makefile -src/Makefile -src/vte.gresource.xml -src/vte/vteversion.h -bindings/Makefile -bindings/gir/Makefile -bindings/vala/Makefile -perf/Makefile -po/Makefile.in -doc/Makefile -doc/openi18n/Makefile -doc/reference/Makefile -doc/reference/version.xml -glade/Makefile -]) - -AC_CONFIG_FILES([vte-${VTE_API_VERSION}.pc:vte.pc.in],[VTE_API_VERSION=${VTE_API_VERSION}]) -AC_CONFIG_FILES([glade/vte-${VTE_API_VERSION}.xml.in:glade/vte.xml.in.in],[VTE_API_VERSION=${VTE_API_VERSION}]) - -AC_OUTPUT - -##################### -# Print configuration -##################### -cat <<EOF | tee -a config.log - -## -------------- ## -## Configuration. ## -## -------------- ## - -Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION - GNUTLS: $with_gnutls - Installing Glade catalogue: $enable_glade_catalogue - Debugging: $enable_debug - Introspection: $enable_introspection - Vala bindings: $enable_vala - Test application: $enable_test_application -EOF diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index fdeb394e..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -NULL = - -SUBDIRS = reference openi18n - -EXTRA_DIST = \ - ambiguous.txt \ - boxes.txt \ - readme.txt \ - rewrap.txt \ - $(NULL) - --include $(top_srcdir)/git.mk diff --git a/doc/openi18n/Makefile.am b/doc/openi18n/Makefile.am deleted file mode 100644 index 214a6c81..00000000 --- a/doc/openi18n/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = UTF-8.txt wrap.txt meson.build - -LIBS= -noinst_PROGRAMS = cursor -cursor_SOURCES = cursor.c - --include $(top_srcdir)/git.mk diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am deleted file mode 100644 index 96e365d7..00000000 --- a/doc/reference/Makefile.am +++ /dev/null @@ -1,157 +0,0 @@ -NULL = - -# We require automake 1.10 for $(abs_builddir) -AUTOMAKE_OPTIONS = 1.10 - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE = vte - -# Uncomment for versioned docs and specify the version of the module, e.g. '2'. -DOC_MODULE_VERSION = $(VTE_API_VERSION) - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR = \ - $(top_srcdir)/src \ - $(top_srcdir)/src/vte \ - $(top_builddir)/src \ - $(top_builddir)/src/vte \ - $(NULL) - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS = - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS = --deprecated-guards="VTE_DISABLE_DEPRECATED" --ignore-decorators='_VTE_GNUC_NONNULL\s*\([^)]*\)' - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS = --source-suffixes=h,hh,c,cc --xml-mode --output-format=xml --name-space=vte - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS = - -# Extra options to supply to gtkdoc-mkhtml -# Add the builddir to the HTML path so that version.xml is found -MKHTML_OPTIONS = --path="$(abs_builddir)" - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS = \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \ - --extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gdk \ - --extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gdk-pixbuf \ - --extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gtk - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB = \ - $(top_srcdir)/src/vte/*.h \ - $(top_builddir)/src/vte/*.h \ - $(NULL) - -CFILE_GLOB = \ - $(top_srcdir)/src/*.c \ - $(top_srcdir)/src/*.cc - -# Extra header to include when scanning, which are not under DOC_SOURCE_DIR -# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -# EXTRA_HFILES = $(top_builddir)/vte/vteversion.h -EXTRA_HFILES = - -# Header files to ignore when scanning. Use base file name, no paths -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES = \ - config.h \ - buffer.h \ - caps.h \ - debug.h \ - iso2022.h \ - keymap.h \ - marshal.h \ - matcher.h \ - ring.h \ - stamp-vtetypebuiltins.h \ - table.h \ - trie.h \ - vteconv.h \ - vtedraw.h \ - vteinternal.hh \ - vterowdata.h \ - vteseq-list.h \ - vtestream-base.h \ - vtestream-file.h \ - vtestream.h \ - vtetc.h \ - vtetree.h \ - vteunistr.h \ - vteunistr.h - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES = - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = \ - version.xml - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files = - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/vte \ - -I$(top_builddir) \ - -I$(top_builddir)/src \ - -I$(top_builddir)/src/vte \ - -DVTE_COMPILATION \ - $(VTE_CFLAGS) - -GTKDOC_LIBS = \ - $(top_builddir)/src/libvte-@VTE_API_VERSION@.la \ - $(VTE_LIBS) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += \ - meson.build \ - version.xml.in - -# Files not to distribute -# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types -# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt -#DISTCLEANFILES += - -# Comment this out if you want your docs-status tested during 'make check' -#if ENABLE_GTK_DOC -#TESTS_ENVIRONMENT = cd $(srcsrc) && -#TESTS = $(GTKDOC_CHECK) -#endif - --include $(top_srcdir)/git.mk diff --git a/git.mk b/git.mk deleted file mode 100644 index 9d4bf251..00000000 --- a/git.mk +++ /dev/null @@ -1,333 +0,0 @@ -# git.mk, a small Makefile to autogenerate .gitignore files -# for autotools-based projects. -# -# Copyright 2009, Red Hat, Inc. -# Copyright 2010,2011,2012,2013 Behdad Esfahbod -# Written by Behdad Esfahbod -# -# Copying and distribution of this file, with or without modification, -# is permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# The latest version of this file can be downloaded from: -GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk -# -# Bugs, etc, should be reported upstream at: -# https://github.com/behdad/git.mk -# -# To use in your project, import this file in your git repo's toplevel, -# then do "make -f git.mk". This modifies all Makefile.am files in -# your project to -include git.mk. Remember to add that line to new -# Makefile.am files you create in your project, or just rerun the -# "make -f git.mk". -# -# This enables automatic .gitignore generation. If you need to ignore -# more files, add them to the GITIGNOREFILES variable in your Makefile.am. -# But think twice before doing that. If a file has to be in .gitignore, -# chances are very high that it's a generated file and should be in one -# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. -# -# The only case that you need to manually add a file to GITIGNOREFILES is -# when remove files in one of mostlyclean-local, clean-local, distclean-local, -# or maintainer-clean-local make targets. -# -# Note that for files like editor backup, etc, there are better places to -# ignore them. See "man gitignore". -# -# If "make maintainer-clean" removes the files but they are not recognized -# by this script (that is, if "git status" shows untracked files still), send -# me the output of "git status" as well as your Makefile.am and Makefile for -# the directories involved and I'll diagnose. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# Makefile.am.sample in the git.mk git repo. -# -# Don't EXTRA_DIST this file. It is supposed to only live in git clones, -# not tarballs. It serves no useful purpose in tarballs and clutters the -# build dir. -# -# This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata, -# appstream. -# -# This makefile provides the following targets: -# -# - all: "make all" will build all gitignore files. -# - gitignore: makes all gitignore files in the current dir and subdirs. -# - .gitignore: make gitignore file for the current dir. -# - gitignore-recurse: makes all gitignore files in the subdirs. -# -# KNOWN ISSUES: -# -# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the -# submodule doesn't find us. If you have configure.{in,ac} files in -# subdirs, add a proxy git.mk file in those dirs that simply does: -# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. -# And add those files to git. See vte/gnome-pty-helper/git.mk for -# example. -# - - - -############################################################################### -# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES: -############################################################################### - -# -# Most autotools-using modules should be fine including this variable in their -# toplevel MAINTAINERCLEANFILES: -GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/configure.scan \ - `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \ - test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ - for x in \ - ar-lib \ - compile \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - test-driver \ - ylwrap \ - ; do echo "$$AUX_DIR/$$x"; done` \ - `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \ - head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` -# -# All modules should also be fine including the following variable, which -# removes automake-generated Makefile.in files: -GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ - `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \ - while read f; do \ - case $$f in Makefile|*/Makefile) \ - test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ - done` -# -# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this, -# though it's harmless to include regardless. -GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ - `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ - if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ - for x in \ - libtool.m4 \ - ltoptions.m4 \ - ltsugar.m4 \ - ltversion.m4 \ - lt~obsolete.m4 \ - ; do echo "$$MACRO_DIR/$$x"; done; \ - fi` - - - -############################################################################### -# Default rule is to install ourselves in all Makefile.am files: -############################################################################### - -git-all: git-mk-install - -git-mk-install: - @echo "Installing git makefile" - @any_failed=; \ - find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ - if grep 'include .*/git.mk' $$x >/dev/null; then \ - echo "$$x already includes git.mk"; \ - else \ - failed=; \ - echo "Updating $$x"; \ - { cat $$x; \ - echo ''; \ - echo '-include $$(top_srcdir)/git.mk'; \ - } > $$x.tmp || failed=1; \ - if test x$$failed = x; then \ - mv $$x.tmp $$x || failed=1; \ - fi; \ - if test x$$failed = x; then : else \ - echo "Failed updating $$x"; >&2 \ - any_failed=1; \ - fi; \ - fi; done; test -z "$$any_failed" - -git-mk-update: - wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk - -.PHONY: git-all git-mk-install git-mk-update - - - -############################################################################### -# Actual .gitignore generation: -############################################################################### - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - @echo "git.mk: Generating $@" - @{ \ - if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ - for x in \ - $(DOC_MODULE)-decl-list.txt \ - $(DOC_MODULE)-decl.txt \ - tmpl/$(DOC_MODULE)-unused.sgml \ - "tmpl/*.bak" \ - xml html \ - ; do echo "/$$x"; done; \ - FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \ - case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \ - fi; \ - if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for lc in $(DOC_LINGUAS); do \ - for x in \ - $(if $(DOC_MODULE),$(DOC_MODULE).xml) \ - $(DOC_PAGES) \ - $(DOC_INCLUDES) \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - for x in \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_MOFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \ - for lc in $(HELP_LINGUAS); do \ - for x in \ - $(HELP_FILES) \ - "$$lc.stamp" \ - "$$lc.mo" \ - ; do echo "/$$lc/$$x"; done; \ - done; \ - fi; \ - if test "x$(gsettings_SCHEMAS)" = x; then :; else \ - for x in \ - $(gsettings_SCHEMAS:.xml=.valid) \ - $(gsettings__enum_file) \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(appdata_XML)" = x; then :; else \ - for x in \ - $(appdata_XML:.xml=.valid) \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(appstream_XML)" = x; then :; else \ - for x in \ - $(appstream_XML:.xml=.valid) \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/po/Makefile.in.in; then \ - for x in \ - po/Makefile.in.in \ - po/Makefile.in.in~ \ - po/Makefile.in \ - po/Makefile \ - po/Makevars.template \ - po/POTFILES \ - po/Rules-quot \ - po/stamp-it \ - po/.intltool-merge-cache \ - "po/*.gmo" \ - "po/*.header" \ - "po/*.mo" \ - "po/*.sed" \ - "po/*.sin" \ - po/$(GETTEXT_PACKAGE).pot \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - ; do echo "/$$x"; done; \ - fi; \ - if test -f $(srcdir)/configure; then \ - for x in \ - autom4te.cache \ - configure \ - config.h \ - stamp-h1 \ - libtool \ - config.lt \ - ; do echo "/$$x"; done; \ - fi; \ - if test "x$(DEJATOOL)" = x; then :; else \ - for x in \ - $(DEJATOOL) \ - ; do echo "/$$x.sum"; echo "/$$x.log"; done; \ - echo /site.exp; \ - fi; \ - if test "x$(am__dirstamp)" = x; then :; else \ - echo "$(am__dirstamp)"; \ - fi; \ - if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \ - for x in \ - "*.lo" \ - ".libs" "_libs" \ - ; do echo "$$x"; done; \ - fi; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \ - $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ - $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ - so_locations \ - $(MOSTLYCLEANFILES) \ - $(TEST_LOGS) \ - $(TEST_LOGS:.log=.trs) \ - $(TEST_SUITE_LOG) \ - $(TESTS:=.test) \ - "*.gcda" \ - "*.gcno" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ - $(filter %_vala.stamp,$(DIST_COMMON)) \ - $(filter %.vapi,$(DIST_COMMON)) \ - $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo "/$$x"; done; \ - for x in \ - "*.$(OBJEXT)" \ - $(DEPDIR) \ - ; do echo "$$x"; done; \ - } | \ - sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ - sed 's@/[.]/@/@g' | \ - LC_ALL=C sort | uniq > $@.tmp && \ - mv $@.tmp $@; - -all: $(srcdir)/.gitignore gitignore-recurse-maybe -gitignore: $(srcdir)/.gitignore gitignore-recurse - -gitignore-recurse-maybe: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \ - done - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/glade/Makefile.am b/glade/Makefile.am deleted file mode 100644 index 06420f3a..00000000 --- a/glade/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -NULL = - -cataloguedir = $(GLADE_CATALOGUE_DIR) -nodist_catalogue_DATA = vte-$(VTE_API_VERSION).xml - -icons = \ - hicolor_actions_16x16_widget-vte-terminal.png \ - hicolor_actions_22x22_widget-vte-terminal.png \ - $(NULL) - -EXTRA_DIST = \ - meson.build \ - $(icons) \ - $(NULL) - -install-icons: - for icon in $(icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(GLADE_ICON_DIR)/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(GLADE_ICON_DIR)/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done - -uninstall-icons: - -for icon in $(icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(GLADE_ICON_DIR)/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done - -validate: $(catalogue_DATA) - xmllint --dtdvalid $(GLADE_CATALOGUE_DIR)/glade-catalog.dtd --noout $< - -install-data-local: install-icons - -uninstall-local: uninstall-icons - -@INTLTOOL_XML_NOMERGE_RULE@ - --include $(top_srcdir)/git.mk diff --git a/m4/attributes.m4 b/m4/attributes.m4 deleted file mode 100644 index e345ee1f..00000000 --- a/m4/attributes.m4 +++ /dev/null @@ -1,289 +0,0 @@ -dnl Macros to check the presence of generic (non-typed) symbols. -dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com> -dnl Copyright (c) 2006-2008 xine project -dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com> -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -dnl 02110-1301, USA. -dnl -dnl As a special exception, the copyright owners of the -dnl macro gives unlimited permission to copy, distribute and modify the -dnl configure scripts that are the output of Autoconf when processing the -dnl Macro. You need not follow the terms of the GNU General Public -dnl License when using or distributing such scripts, even though portions -dnl of the text of the Macro appear in them. The GNU General Public -dnl License (GPL) does govern all other use of the material that -dnl constitutes the Autoconf Macro. -dnl -dnl This special exception to the GPL applies to versions of the -dnl Autoconf Macro released by this project. When you make and -dnl distribute a modified version of the Autoconf Macro, you may extend -dnl this special exception to the GPL to apply to your modified version as -dnl well. - -dnl Check if FLAG in ENV-VAR is supported by compiler and append it -dnl to WHERE-TO-APPEND variable. Note that we invert -Wno-* checks to -dnl -W* as gcc cannot test for negated warnings. -dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG]) - -AC_DEFUN([CC_CHECK_FLAG_APPEND], [ - AC_CACHE_CHECK([if $_AC_CC supports flag $3 in envvar $2], - AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3]), - [eval "AS_TR_SH([cc_save_$2])='${$2}'" - eval "AS_TR_SH([$2])='-Werror `echo "$3" | sed 's/^-Wno-/-W/'`'" - AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return 0; } ])], - [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3])='yes'"], - [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3])='no'"]) - eval "AS_TR_SH([$2])='$cc_save_$2'"]) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3])[ = xyes], - [eval "$1='${$1} $3'"]) -]) - -dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2]) -AC_DEFUN([CC_CHECK_FLAGS_APPEND], [ - for flag in $3; do - CC_CHECK_FLAG_APPEND($1, $2, $flag) - done -]) - -dnl Check if the flag is supported by linker (cacheable) -dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) - -AC_DEFUN([CC_CHECK_LDFLAGS], [ - AC_CACHE_CHECK([if $_AC_CC supports $1 flag], - AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1]), - [ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $1" - AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 1; }])], - [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1])='yes'"], - [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1])="]) - LDFLAGS="$ac_save_LDFLAGS" - ]) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1])[ = xyes], - [$2], [$3]) -]) - -dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for -dnl the current linker to avoid undefined references in a shared object. -AC_DEFUN([CC_NOUNDEFINED], [ - dnl We check $host for which systems to enable this for. - AC_REQUIRE([AC_CANONICAL_HOST]) - - case $host in - dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads - dnl are requested, as different implementations are present; to avoid problems - dnl use -Wl,-z,defs only for those platform not behaving this way. - *-freebsd* | *-openbsd*) ;; - *) - dnl First of all check for the --no-undefined variant of GNU ld. This allows - dnl for a much more readable command line, so that people can understand what - dnl it does without going to look for what the heck -z defs does. - for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do - CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) - break - done - ;; - esac - - AC_SUBST([LDFLAGS_NOUNDEFINED]) -]) - -dnl Check for a -Werror flag or equivalent. -Werror is the GCC -dnl and ICC flag that tells the compiler to treat all the warnings -dnl as fatal. We usually need this option to make sure that some -dnl constructs (like attributes) are not simply ignored. -dnl -dnl Other compilers don't support -Werror per se, but they support -dnl an equivalent flag: -dnl - Sun Studio compiler supports -errwarn=%all -AC_DEFUN([CC_CHECK_WERROR], [ - AC_CACHE_CHECK( - [for $_AC_CC way to treat warnings as errors], - [cc_cv_[]_AC_LANG_ABBREV[]_werror], - [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_[]_AC_LANG_ABBREV[]_werror=-Werror], - [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_[]_AC_LANG_ABBREV[]_werror=-errwarn=%all])]) - ]) -]) - -AC_DEFUN([CC_CHECK_ATTRIBUTE], [ - AC_REQUIRE([CC_CHECK_WERROR]) - AC_CACHE_CHECK([if $_AC_CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], - AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1]), - [ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], - [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1])='yes'"], - [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1])='no'"]) - CFLAGS="$ac_save_CFLAGS" - ]) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1])[ = xyes], - [AC_DEFINE( - AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, - [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] - ) - $4], - [$5]) -]) - -AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ - CC_CHECK_ATTRIBUTE( - [constructor],, - [void __attribute__((constructor)) ctor() { int a; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ - CC_CHECK_ATTRIBUTE( - [format], [format(printf, n, n)], - [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ - CC_CHECK_ATTRIBUTE( - [format_arg], [format_arg(printf)], - [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ - CC_CHECK_ATTRIBUTE( - [visibility_$1], [visibility("$1")], - [void __attribute__((visibility("$1"))) $1_function() { }], - [$2], [$3]) -]) - -AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ - CC_CHECK_ATTRIBUTE( - [nonnull], [nonnull()], - [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ - CC_CHECK_ATTRIBUTE( - [unused], , - [void some_function(void *foo, __attribute__((unused)) void *bar);], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ - CC_CHECK_ATTRIBUTE( - [sentinel], , - [void some_function(void *foo, ...) __attribute__((sentinel));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ - CC_CHECK_ATTRIBUTE( - [deprecated], , - [void some_function(void *foo, ...) __attribute__((deprecated));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ - CC_CHECK_ATTRIBUTE( - [alias], [weak, alias], - [void other_function(void *foo) { } - void some_function(void *foo) __attribute__((weak, alias("other_function")));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ - CC_CHECK_ATTRIBUTE( - [malloc], , - [void * __attribute__((malloc)) my_alloc(int n);], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_PACKED], [ - CC_CHECK_ATTRIBUTE( - [packed], , - [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_CONST], [ - CC_CHECK_ATTRIBUTE( - [const], , - [int __attribute__((const)) twopow(int n) { return 1 << n; } ], - [$1], [$2]) -]) - -AC_DEFUN([CC_FLAG_VISIBILITY], [ - AC_REQUIRE([CC_CHECK_WERROR]) - AC_CACHE_CHECK([if $_AC_CC supports -fvisibility=hidden], - [cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility], - [cc_flag_visibility_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror" - CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], - cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility='yes', - cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility='no') - CFLAGS="$cc_flag_visibility_save_CFLAGS"]) - - AS_IF([test "x$cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility" = "xyes"], - [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, - [Define this if the compiler supports the -fvisibility flag]) - $1], - [$2]) -]) - -AC_DEFUN([CC_FUNC_EXPECT], [ - AC_REQUIRE([CC_CHECK_WERROR]) - AC_CACHE_CHECK([if compiler has __builtin_expect function], - [cc_cv_[]_AC_LANG_ABBREV[]_func_expect], - [ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror" - AC_COMPILE_IFELSE([AC_LANG_SOURCE( - [int some_function() { - int a = 3; - return (int)__builtin_expect(a, 3); - }])], - [cc_cv_[]_AC_LANG_ABBREV[]_func_expect=yes], - [cc_cv_[]_AC_LANG_ABBREV[]_func_expect=no]) - CFLAGS="$ac_save_CFLAGS" - ]) - - AS_IF([test "x$cc_cv_[]_AC_LANG_ABBREV[]_func_expect" = "xyes"], - [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1, - [Define this if the compiler supports __builtin_expect() function]) - $1], - [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ - AC_REQUIRE([CC_CHECK_WERROR]) - AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported], - [cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned], - [ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror" - for cc_attribute_align_try in 64 32 16 8 4 2; do - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - int main() { - static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; - return c; - }])], [cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned=$cc_attribute_align_try; break]) - done - CFLAGS="$ac_save_CFLAGS" - ]) - - if test "x$cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned" != "x"; then - AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned], - [Define the highest alignment supported]) - fi -]) diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 deleted file mode 100644 index 5032bba8..00000000 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ /dev/null @@ -1,982 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the specified -# version of the C++ standard. If necessary, add switches to CXX and -# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) -# or '14' (for the C++14 standard). -# -# The second argument, if specified, indicates whether you insist on an -# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -# -std=c++11). If neither is specified, you get whatever works, with -# preference for an extended mode. -# -# The third argument, if specified 'mandatory' or if left unspecified, -# indicates that baseline support for the specified C++ standard is -# required and that the macro should error out if no mode with that -# support is found. If specified 'optional', then configuration proceeds -# regardless, after defining HAVE_CXX${VERSION} if and only if a -# supporting mode is found. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> -# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> -# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com> -# Copyright (c) 2015 Paul Norman <penorman@mac.com> -# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu> -# Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 7 - -dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro -dnl (serial version number 13). - -AX_REQUIRE_DEFINED([AC_MSG_WARN]) -AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], - [$1], [14], [ax_cxx_compile_alternatives="14 1y"], - [$1], [17], [ax_cxx_compile_alternatives="17 1z"], - [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl - m4_if([$2], [], [], - [$2], [ext], [], - [$2], [noext], [], - [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl - m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], - [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], - [$3], [optional], [ax_cxx_compile_cxx$1_required=false], - [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) - AC_LANG_PUSH([C++])dnl - ac_success=no - AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, - ax_cv_cxx_compile_cxx$1, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [ax_cv_cxx_compile_cxx$1=yes], - [ax_cv_cxx_compile_cxx$1=no])]) - if test x$ax_cv_cxx_compile_cxx$1 = xyes; then - ac_success=yes - fi - - m4_if([$2], [noext], [], [dnl - if test x$ac_success = xno; then - for alternative in ${ax_cxx_compile_alternatives}; do - switch="-std=gnu++${alternative}" - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, - [ac_save_CXX="$CXX" - CXX="$CXX $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXX="$ac_save_CXX"]) - if eval test x\$$cachevar = xyes; then - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then - CXXCPP="$CXXCPP $switch" - fi - ac_success=yes - break - fi - done - fi]) - - m4_if([$2], [ext], [], [dnl - if test x$ac_success = xno; then - dnl HP's aCC needs +std=c++11 according to: - dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf - dnl Cray's crayCC needs "-h std=c++11" - for alternative in ${ax_cxx_compile_alternatives}; do - for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, - [ac_save_CXX="$CXX" - CXX="$CXX $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXX="$ac_save_CXX"]) - if eval test x\$$cachevar = xyes; then - CXX="$CXX $switch" - if test -n "$CXXCPP" ; then - CXXCPP="$CXXCPP $switch" - fi - ac_success=yes - break - fi - done - if test x$ac_success = xyes; then - break - fi - done - fi]) - AC_LANG_POP([C++]) - if test x$ax_cxx_compile_cxx$1_required = xtrue; then - if test x$ac_success = xno; then - AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) - fi - fi - if test x$ac_success = xno; then - HAVE_CXX$1=0 - AC_MSG_NOTICE([No compiler with C++$1 support was found]) - else - HAVE_CXX$1=1 - AC_DEFINE(HAVE_CXX$1,1, - [define if the compiler supports basic C++$1 syntax]) - fi - AC_SUBST(HAVE_CXX$1) - m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])]) -]) - - -dnl Test body for checking C++11 support - -m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], - _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -) - - -dnl Test body for checking C++14 support - -m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], - _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 - _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 -) - -m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], - _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 - _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 - _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 -) - -dnl Tests for new features in C++11 - -m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ - -// If the compiler admits that it is not ready for C++11, why torture it? -// Hopefully, this will speed up the test. - -#ifndef __cplusplus - -#error "This is not a C++ compiler" - -#elif __cplusplus < 201103L - -#error "This is not a C++11 compiler" - -#else - -namespace cxx11 -{ - - namespace test_static_assert - { - - template <typename T> - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - } - - namespace test_final_override - { - - struct Base - { - virtual void f() {} - }; - - struct Derived : public Base - { - virtual void f() override {} - }; - - } - - namespace test_double_right_angle_brackets - { - - template < typename T > - struct check {}; - - typedef check<void> single_type; - typedef check<check<void>> double_type; - typedef check<check<check<void>>> triple_type; - typedef check<check<check<check<void>>>> quadruple_type; - - } - - namespace test_decltype - { - - int - f() - { - int a = 1; - decltype(a) b = 2; - return a + b; - } - - } - - namespace test_type_deduction - { - - template < typename T1, typename T2 > - struct is_same - { - static const bool value = false; - }; - - template < typename T > - struct is_same<T, T> - { - static const bool value = true; - }; - - template < typename T1, typename T2 > - auto - add(T1 a1, T2 a2) -> decltype(a1 + a2) - { - return a1 + a2; - } - - int - test(const int c, volatile int v) - { - static_assert(is_same<int, decltype(0)>::value == true, ""); - static_assert(is_same<int, decltype(c)>::value == false, ""); - static_assert(is_same<int, decltype(v)>::value == false, ""); - auto ac = c; - auto av = v; - auto sumi = ac + av + 'x'; - auto sumf = ac + av + 1.0; - static_assert(is_same<int, decltype(ac)>::value == true, ""); - static_assert(is_same<int, decltype(av)>::value == true, ""); - static_assert(is_same<int, decltype(sumi)>::value == true, ""); - static_assert(is_same<int, decltype(sumf)>::value == false, ""); - static_assert(is_same<int, decltype(add(c, v))>::value == true, ""); - return (sumf > 0.0) ? sumi : add(c, v); - } - - } - - namespace test_noexcept - { - - int f() { return 0; } - int g() noexcept { return 0; } - - static_assert(noexcept(f()) == false, ""); - static_assert(noexcept(g()) == true, ""); - - } - - namespace test_constexpr - { - - template < typename CharT > - unsigned long constexpr - strlen_c_r(const CharT *const s, const unsigned long acc) noexcept - { - return *s ? strlen_c_r(s + 1, acc + 1) : acc; - } - - template < typename CharT > - unsigned long constexpr - strlen_c(const CharT *const s) noexcept - { - return strlen_c_r(s, 0UL); - } - - static_assert(strlen_c("") == 0UL, ""); - static_assert(strlen_c("1") == 1UL, ""); - static_assert(strlen_c("example") == 7UL, ""); - static_assert(strlen_c("another\0example") == 7UL, ""); - - } - - namespace test_rvalue_references - { - - template < int N > - struct answer - { - static constexpr int value = N; - }; - - answer<1> f(int&) { return answer<1>(); } - answer<2> f(const int&) { return answer<2>(); } - answer<3> f(int&&) { return answer<3>(); } - - void - test() - { - int i = 0; - const int c = 0; - static_assert(decltype(f(i))::value == 1, ""); - static_assert(decltype(f(c))::value == 2, ""); - static_assert(decltype(f(0))::value == 3, ""); - } - - } - - namespace test_uniform_initialization - { - - struct test - { - static const int zero {}; - static const int one {1}; - }; - - static_assert(test::zero == 0, ""); - static_assert(test::one == 1, ""); - - } - - namespace test_lambdas - { - - void - test1() - { - auto lambda1 = [](){}; - auto lambda2 = lambda1; - lambda1(); - lambda2(); - } - - int - test2() - { - auto a = [](int i, int j){ return i + j; }(1, 2); - auto b = []() -> int { return '0'; }(); - auto c = [=](){ return a + b; }(); - auto d = [&](){ return c; }(); - auto e = [a, &b](int x) mutable { - const auto identity = [](int y){ return y; }; - for (auto i = 0; i < a; ++i) - a += b--; - return x + identity(a + b); - }(0); - return a + b + c + d + e; - } - - int - test3() - { - const auto nullary = [](){ return 0; }; - const auto unary = [](int x){ return x; }; - using nullary_t = decltype(nullary); - using unary_t = decltype(unary); - const auto higher1st = [](nullary_t f){ return f(); }; - const auto higher2nd = [unary](nullary_t f1){ - return [unary, f1](unary_t f2){ return f2(unary(f1())); }; - }; - return higher1st(nullary) + higher2nd(nullary)(unary); - } - - } - - namespace test_variadic_templates - { - - template <int...> - struct sum; - - template <int N0, int... N1toN> - struct sum<N0, N1toN...> - { - static constexpr auto value = N0 + sum<N1toN...>::value; - }; - - template <> - struct sum<> - { - static constexpr auto value = 0; - }; - - static_assert(sum<>::value == 0, ""); - static_assert(sum<1>::value == 1, ""); - static_assert(sum<23>::value == 23, ""); - static_assert(sum<1, 2>::value == 3, ""); - static_assert(sum<5, 5, 11>::value == 21, ""); - static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); - - } - - // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae - // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function - // because of this. - namespace test_template_alias_sfinae - { - - struct foo {}; - - template<typename T> - using member = typename T::member_type; - - template<typename T> - void func(...) {} - - template<typename T> - void func(member<T>*) {} - - void test(); - - void test() { func<foo>(0); } - - } - -} // namespace cxx11 - -#endif // __cplusplus >= 201103L - -]]) - - -dnl Tests for new features in C++14 - -m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ - -// If the compiler admits that it is not ready for C++14, why torture it? -// Hopefully, this will speed up the test. - -#ifndef __cplusplus - -#error "This is not a C++ compiler" - -#elif __cplusplus < 201402L - -#error "This is not a C++14 compiler" - -#else - -namespace cxx14 -{ - - namespace test_polymorphic_lambdas - { - - int - test() - { - const auto lambda = [](auto&&... args){ - const auto istiny = [](auto x){ - return (sizeof(x) == 1UL) ? 1 : 0; - }; - const int aretiny[] = { istiny(args)... }; - return aretiny[0]; - }; - return lambda(1, 1L, 1.0f, '1'); - } - - } - - namespace test_binary_literals - { - - constexpr auto ivii = 0b0000000000101010; - static_assert(ivii == 42, "wrong value"); - - } - - namespace test_generalized_constexpr - { - - template < typename CharT > - constexpr unsigned long - strlen_c(const CharT *const s) noexcept - { - auto length = 0UL; - for (auto p = s; *p; ++p) - ++length; - return length; - } - - static_assert(strlen_c("") == 0UL, ""); - static_assert(strlen_c("x") == 1UL, ""); - static_assert(strlen_c("test") == 4UL, ""); - static_assert(strlen_c("another\0test") == 7UL, ""); - - } - - namespace test_lambda_init_capture - { - - int - test() - { - auto x = 0; - const auto lambda1 = [a = x](int b){ return a + b; }; - const auto lambda2 = [a = lambda1(x)](){ return a; }; - return lambda2(); - } - - } - - namespace test_digit_separators - { - - constexpr auto ten_million = 100'000'000; - static_assert(ten_million == 100000000, ""); - - } - - namespace test_return_type_deduction - { - - auto f(int& x) { return x; } - decltype(auto) g(int& x) { return x; } - - template < typename T1, typename T2 > - struct is_same - { - static constexpr auto value = false; - }; - - template < typename T > - struct is_same<T, T> - { - static constexpr auto value = true; - }; - - int - test() - { - auto x = 0; - static_assert(is_same<int, decltype(f(x))>::value, ""); - static_assert(is_same<int&, decltype(g(x))>::value, ""); - return x; - } - - } - -} // namespace cxx14 - -#endif // __cplusplus >= 201402L - -]]) - - -dnl Tests for new features in C++17 - -m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ - -// If the compiler admits that it is not ready for C++17, why torture it? -// Hopefully, this will speed up the test. - -#ifndef __cplusplus - -#error "This is not a C++ compiler" - -#elif __cplusplus <= 201402L - -#error "This is not a C++17 compiler" - -#else - -#if defined(__clang__) - #define REALLY_CLANG -#else - #if defined(__GNUC__) - #define REALLY_GCC - #endif -#endif - -#include <initializer_list> -#include <utility> -#include <type_traits> - -namespace cxx17 -{ - -#if !defined(REALLY_CLANG) - namespace test_constexpr_lambdas - { - - // TODO: test it with clang++ from git - - constexpr int foo = [](){return 42;}(); - - } -#endif // !defined(REALLY_CLANG) - - namespace test::nested_namespace::definitions - { - - } - - namespace test_fold_expression - { - - template<typename... Args> - int multiply(Args... args) - { - return (args * ... * 1); - } - - template<typename... Args> - bool all(Args... args) - { - return (args && ...); - } - - } - - namespace test_extended_static_assert - { - - static_assert (true); - - } - - namespace test_auto_brace_init_list - { - - auto foo = {5}; - auto bar {5}; - - static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value); - static_assert(std::is_same<int, decltype(bar)>::value); - } - - namespace test_typename_in_template_template_parameter - { - - template<template<typename> typename X> struct D; - - } - - namespace test_fallthrough_nodiscard_maybe_unused_attributes - { - - int f1() - { - return 42; - } - - [[nodiscard]] int f2() - { - [[maybe_unused]] auto unused = f1(); - - switch (f1()) - { - case 17: - f1(); - [[fallthrough]]; - case 42: - f1(); - } - return f1(); - } - - } - - namespace test_extended_aggregate_initialization - { - - struct base1 - { - int b1, b2 = 42; - }; - - struct base2 - { - base2() { - b3 = 42; - } - int b3; - }; - - struct derived : base1, base2 - { - int d; - }; - - derived d1 {{1, 2}, {}, 4}; // full initialization - derived d2 {{}, {}, 4}; // value-initialized bases - - } - - namespace test_general_range_based_for_loop - { - - struct iter - { - int i; - - int& operator* () - { - return i; - } - - const int& operator* () const - { - return i; - } - - iter& operator++() - { - ++i; - return *this; - } - }; - - struct sentinel - { - int i; - }; - - bool operator== (const iter& i, const sentinel& s) - { - return i.i == s.i; - } - - bool operator!= (const iter& i, const sentinel& s) - { - return !(i == s); - } - - struct range - { - iter begin() const - { - return {0}; - } - - sentinel end() const - { - return {5}; - } - }; - - void f() - { - range r {}; - - for (auto i : r) - { - [[maybe_unused]] auto v = i; - } - } - - } - - namespace test_lambda_capture_asterisk_this_by_value - { - - struct t - { - int i; - int foo() - { - return [*this]() - { - return i; - }(); - } - }; - - } - - namespace test_enum_class_construction - { - - enum class byte : unsigned char - {}; - - byte foo {42}; - - } - - namespace test_constexpr_if - { - - template <bool cond> - int f () - { - if constexpr(cond) - { - return 13; - } - else - { - return 42; - } - } - - } - - namespace test_selection_statement_with_initializer - { - - int f() - { - return 13; - } - - int f2() - { - if (auto i = f(); i > 0) - { - return 3; - } - - switch (auto i = f(); i + 4) - { - case 17: - return 2; - - default: - return 1; - } - } - - } - -#if !defined(REALLY_CLANG) - namespace test_template_argument_deduction_for_class_templates - { - - // TODO: test it with clang++ from git - - template <typename T1, typename T2> - struct pair - { - pair (T1 p1, T2 p2) - : m1 {p1}, - m2 {p2} - {} - - T1 m1; - T2 m2; - }; - - void f() - { - [[maybe_unused]] auto p = pair{13, 42u}; - } - - } -#endif // !defined(REALLY_CLANG) - - namespace test_non_type_auto_template_parameters - { - - template <auto n> - struct B - {}; - - B<5> b1; - B<'a'> b2; - - } - -#if !defined(REALLY_CLANG) - namespace test_structured_bindings - { - - // TODO: test it with clang++ from git - - int arr[2] = { 1, 2 }; - std::pair<int, int> pr = { 1, 2 }; - - auto f1() -> int(&)[2] - { - return arr; - } - - auto f2() -> std::pair<int, int>& - { - return pr; - } - - struct S - { - int x1 : 2; - volatile double y1; - }; - - S f3() - { - return {}; - } - - auto [ x1, y1 ] = f1(); - auto& [ xr1, yr1 ] = f1(); - auto [ x2, y2 ] = f2(); - auto& [ xr2, yr2 ] = f2(); - const auto [ x3, y3 ] = f3(); - - } -#endif // !defined(REALLY_CLANG) - -#if !defined(REALLY_CLANG) - namespace test_exception_spec_type_system - { - - // TODO: test it with clang++ from git - - struct Good {}; - struct Bad {}; - - void g1() noexcept; - void g2(); - - template<typename T> - Bad - f(T*, T*); - - template<typename T1, typename T2> - Good - f(T1*, T2*); - - static_assert (std::is_same_v<Good, decltype(f(g1, g2))>); - - } -#endif // !defined(REALLY_CLANG) - - namespace test_inline_variables - { - - template<class T> void f(T) - {} - - template<class T> inline T g(T) - { - return T{}; - } - - template<> inline void f<>(int) - {} - - template<> int g<>(int) - { - return 5; - } - - } - -} // namespace cxx17 - -#endif // __cplusplus <= 201402L - -]]) diff --git a/perf/Makefile.am b/perf/Makefile.am deleted file mode 100644 index a5d68431..00000000 --- a/perf/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = \ - 256test.sh \ - UTF-8-demo.txt \ - img.sh \ - inc.sh \ - random.sh \ - scroll.vim \ - utf8.sh \ - vim.sh \ - $(NULL) - --include $(top_srcdir)/git.mk diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index ae6ef274..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,401 +0,0 @@ -bin_PROGRAMS = -noinst_PROGRAMS = testvte - -CLEANFILES = -DISTCLEANFILES = -MAINTAINERCLEANFILES = -EXTRA_DIST = \ - meson.build \ - vte/meson.build \ - $(NULL) - -# The library - -headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte -header_HEADERS = \ - vte/vte.h \ - vte/vtedeprecated.h \ - vte/vteenums.h \ - vte/vteglobals.h \ - vte/vtemacros.h \ - vte/vtepty.h \ - vte/vteregex.h \ - vte/vteterminal.h \ - $(NULL) - -nodist_header_HEADERS = \ - vte/vtetypebuiltins.h \ - vte/vteversion.h \ - $(NULL) - -lib_LTLIBRARIES = libvte-@VTE_API_MAJOR_VERSION@.@VTE_API_MINOR_VERSION@.la - -EXTRA_libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_SOURCES = \ - box_drawing_generate.sh \ - marshal.list \ - vteseq-n.gperf \ - vteseq-n.cc \ - vtetypebuiltins.cc.template \ - vtetypebuiltins.h.template \ - $(NULL) - -libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_SOURCES = \ - vte/vte.h \ - vte/vtedeprecated.h \ - vte/vteenums.h \ - vte/vteglobals.h \ - vte/vtemacros.h \ - vte/vtepty.h \ - vte/vteregex.h \ - vte/vteterminal.h \ - buffer.h \ - caps.cc \ - caps.h \ - debug.cc \ - debug.h \ - iso2022.cc \ - iso2022.h \ - keymap.cc \ - keymap.h \ - matcher.cc \ - matcher.h \ - pty.cc \ - reaper.cc \ - reaper.hh \ - ring.cc \ - ring.h \ - table.cc \ - table.h \ - vte.cc \ - vteaccess.cc \ - vteaccess.h \ - vteconv.cc \ - vteconv.h \ - vtedefines.hh \ - vtedraw.cc \ - vtedraw.hh \ - vtegtk.cc \ - vtegtk.hh \ - vteinternal.hh \ - vtepcre2.h \ - vtepty-private.h \ - vteregex.cc \ - vteregexinternal.hh \ - vterowdata.cc \ - vterowdata.h \ - vtespawn.cc \ - vtespawn.hh \ - vteseq.cc \ - vteseq-list.h \ - vtestream.cc \ - vtestream.h \ - vtestream-base.h \ - vtestream-file.h \ - vtetree.cc \ - vtetree.h \ - vtetypes.cc \ - vtetypes.hh \ - vteunistr.cc \ - vteunistr.h \ - vteutils.cc \ - vteutils.h \ - $(NULL) - -nodist_libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_SOURCES = \ - box_drawing.h \ - marshal.cc \ - marshal.h \ - vteresources.cc \ - vtetypebuiltins.cc \ - vte/vtetypebuiltins.h \ - vte/vteversion.h \ - $(NULL) - -libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Vte\" \ - -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \ - -DDATADIR='"$(datadir)"' \ - -DLIBEXECDIR='"$(libexecdir)"' \ - -DLOCALEDIR='"$(localedir)"' \ - -DGLIB_DISABLE_DEPRECATION_WARNINGS \ - -DVTE_COMPILATION \ - -I$(builddir)/vte \ - -I$(srcdir)/vte \ - $(AM_CPPFLAGS) - -libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_CXXFLAGS = \ - $(VTE_CFLAGS) \ - $(AM_CXXFLAGS) - -libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_LDFLAGS = \ - $(VTE_CXXLDFLAGS) \ - -version-info $(LT_VERSION_INFO) \ - $(AM_LDFLAGS) - -libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_LIBADD = \ - $(VTE_LIBS) - -# Generated sources - -BUILT_SOURCES = \ - box_drawing.h \ - marshal.cc \ - marshal.h \ - vtetypebuiltins.cc \ - vte/vtetypebuiltins.h \ - vteresources.cc \ - vteseq-list.h \ - vteseq-n.cc \ - $(NULL) -EXTRA_DIST += box_drawing.txt box_drawing_generate.sh iso2022.txt -CLEANFILES += $(BUILT_SOURCES) stamp-vtetypebuiltins.h - -box_drawing.h: box_drawing.txt box_drawing_generate.sh - $(AM_V_GEN) $(srcdir)/box_drawing_generate.sh $< > $@ - -marshal.cc: marshal.list - $(AM_V_GEN) echo '#include "marshal.h"' > $@ \ - && $(GLIB_GENMARSHAL) --prefix=_vte_marshal --body --internal $< >> $@ - -marshal.h: marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --internal $< > $@ - -vte/vtetypebuiltins.h: stamp-vtetypebuiltins.h - @true -stamp-vtetypebuiltins.h: vtetypebuiltins.h.template vte/vteenums.h vte/vtedeprecated.h - $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter %.h,$^) > xgen-vtbh \ - && (cmp -s xgen-vtbh vte/vtetypebuiltins.h || cp xgen-vtbh vte/vtetypebuiltins.h ) \ - && rm -f xgen-vtbh \ - && echo timestamp > $(@F) - -vtetypebuiltins.cc: vtetypebuiltins.cc.template vte/vteenums.h vte/vtedeprecated.h - $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter %.h,$^) > xgen-vtbc \ - && (cmp -s xgen-vtbc vtetypebuiltins.cc || cp xgen-vtbc vtetypebuiltins.cc ) \ - && rm -f xgen-vtbc - -vteseq-n.cc: vteseq-n.gperf - $(AM_V_GEN) $(top_srcdir)/missing --run $(GPERF) -m 100 $< > $@.tmp && \ - mv -f $@.tmp $@ - -vteseq-list.h: vteseq-n.gperf - $(AM_V_GEN) echo '/* Generated file. Do not edit */' > $@.tmp && \ - cat $^ | grep -v '^#' | grep '\<VTE_SEQUENCE_HANDLER\>'| sed 's/.*, //' | LANG=C sort -u >> $@.tmp && \ - mv -f $@.tmp $@ - -vteresources.cc: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate-source --c-name _vte $< - -# C Test application - -testvte_SOURCES = \ - vteapp.c \ - vtepcre2.h \ - debug.c \ - debug.h \ - $(NULL) - -testvte_CPPFLAGS = \ - -DGLIB_DISABLE_DEPRECATION_WARNINGS \ - -DGDK_DISABLE_DEPRECATION_WARNINGS \ - -I$(builddir)/vte \ - -I$(srcdir)/vte \ - $(AM_CPPFLAGS) - -testvte_CFLAGS = \ - $(VTE_CFLAGS) \ - $(AM_CFLAGS) - -testvte_LDADD = \ - libvte-$(VTE_API_VERSION).la \ - $(VTE_LIBS) - -# Misc unit tests and utilities - -noinst_PROGRAMS += interpret slowcat -noinst_SCRIPTS = decset osc window -EXTRA_DIST += $(noinst_SCRIPTS) - -check_PROGRAMS = \ - dumpkeys \ - reaper \ - reflect-text-view \ - reflect-vte mev \ - table \ - xticker \ - vteconv \ - vtestream-file \ - test-vtetypes \ - $(NULL) - -dist_check_SCRIPTS = \ - check-doc-syntax.sh \ - test-vte-sh.sh \ - $(NULL) - -TESTS = \ - reaper \ - table \ - test-vtetypes \ - vteconv \ - vtestream-file \ - $(dist_check_SCRIPTS) \ - $(NULL) - -TESTS_ENVIRONMENT = \ - srcdir="$(srcdir)" \ - top_builddir="$(top_builddir)" \ - VTE_API_VERSION="$(VTE_API_VERSION)" \ - $(NULL) - -reaper_CPPFLAGS = -DMAIN -I$(builddir) -I$(srcdir) $(AM_CPPFLAGS) -reaper_CXXFLAGS = $(VTE_CFLAGS) $(AM_CXXFLAGS) -reaper_SOURCES = \ - debug.cc \ - debug.h \ - reaper.cc \ - reaper.hh \ - $(NULL) -reaper_LDADD = $(VTE_LIBS) - -reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW -I$(builddir)/vte -I$(srcdir)/vte $(AM_CPPFLAGS) -reflect_text_view_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS) -reflect_text_view_SOURCES = reflect.c -reflect_text_view_LDADD = $(VTE_LIBS) - -reflect_vte_CPPFLAGS = -DUSE_VTE -I$(builddir)/vte -I$(srcdir)/vte $(AM_CPPFLAGS) -reflect_vte_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS) -reflect_vte_SOURCES = reflect.c -reflect_vte_LDADD = libvte-$(VTE_API_VERSION).la $(VTE_LIBS) - -interpret_SOURCES = \ - buffer.h \ - caps.cc \ - caps.h \ - debug.cc \ - debug.h \ - iso2022.cc \ - iso2022.h \ - matcher.cc \ - matcher.h \ - table.cc \ - table.h \ - vteconv.cc \ - vteconv.h \ - vtetree.cc \ - vtetree.h \ - interpret.c -interpret_CPPFLAGS = \ - -DINTERPRET_MAIN \ - -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \ - -I$(builddir) \ - -I$(srcdir) \ - $(AM_CPPFLAGS) -interpret_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(GOBJECT_CFLAGS) \ - $(GTK_CFLAGS) \ - $(AM_CFLAGS) -interpret_CXXFLAGS = \ - $(GLIB_CFLAGS) \ - $(GOBJECT_CFLAGS) \ - $(GTK_CFLAGS) \ - $(AM_CXXFLAGS) -interpret_LDADD = \ - $(GLIB_LIBS) \ - $(GOBJECT_LIBS) - -slowcat_SOURCES = \ - slowcat.c \ - $(NULL) -slowcat_CPPFLAGS = -I$(builddir) -I$(srcdir) $(AM_CPPFLAGS) -slowcat_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) -slowcat_LDADD = $(GLIB_LIBS) - -table_SOURCES = \ - buffer.h \ - caps.cc \ - caps.h \ - debug.cc \ - debug.h \ - matcher.cc \ - matcher.h \ - table.cc \ - table.h \ - vteconv.cc \ - vteconv.h \ - $(NULL) -table_CPPFLAGS = \ - -DTABLE_MAIN \ - -I$(builddir) \ - -I$(srcdir) \ - $(AM_CPPFLAGS) -table_CXXFLAGS = \ - $(GLIB_CFLAGS) \ - $(AM_CXXFLAGS) -table_LDADD = \ - $(GLIB_LIBS) \ - $(GOBJECT_LIBS) - -test_vtetypes_SOURCES = \ - vtetypes.cc \ - vtetypes.hh \ - $(NULL) -test_vtetypes_CPPFLAGS = \ - -DMAIN \ - -I$(builddir) \ - -I$(srcdir) \ - $(AM_CPPFLAGS) -test_vtetypes_CXXFLAGS = \ - $(VTE_CFLAGS) \ - $(AM_CXXFLAGS) -test_vtetypes_LDADD = \ - $(VTE_LIBS) \ - $(NULL) - -vtestream_file_SOURCES = \ - vtestream-base.h \ - vtestream-file.h \ - vtestream.cc \ - vtestream.h \ - vteutils.cc \ - vteutils.h \ - $(NULL) -vtestream_file_CPPFLAGS = \ - -DVTESTREAM_MAIN \ - -I$(builddir) \ - -I$(srcdir) \ - $(AM_CPPFLAGS) -vtestream_file_CXXFLAGS = \ - $(VTE_CFLAGS) \ - $(AM_CXXFLAGS) -vtestream_file_LDADD = \ - $(VTE_LIBS) - -vteconv_SOURCES = buffer.h debug.cc debug.h vteconv.cc vteconv.h -vteconv_CPPFLAGS = -DVTECONV_MAIN -I$(builddir) -I$(srcdir) $(AM_CPPFLAGS) -vteconv_CXXFLAGS = $(VTE_CFLAGS) $(AM_CXXFLAGS) -vteconv_LDADD = $(VTE_LIBS) - -dumpkeys_SOURCES = dumpkeys.c -dumpkeys_CPPFLAGS = -I$(builddir) -I$(srcdir) $(AM_CPPFLAGS) -dumpkeys_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) -dumpkeys_LDADD = $(GLIB_LIBS) - -mev_SOURCES = mev.c -mev_CPPFLAGS = -I$(builddir) -I$(srcdir) $(AM_CPPFLAGS) -mev_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) -mev_LDADD = $(GLIB_LIBS) - -xticker_SOURCES = xticker.c -xticker_CPPFLAGS = -I$(builddir) -I$(srcdir) $(AM_CPPFLAGS) -xticker_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) -xticker_LDADD = $(GLIB_LIBS) - -# Shell - -profiledir = $(sysconfdir)/profile.d -dist_profile_DATA = vte.sh - -.DELETE_ON_ERROR: - --include $(top_srcdir)/git.mk diff --git a/vte.pc.in b/vte.pc.in deleted file mode 100644 index 7dd5559b..00000000 --- a/vte.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: vte -Description: Vte terminal widget. -Version: @VERSION@ -Requires: @VTE_PKGS@ -Libs: -L${libdir} -lvte-@VTE_API_VERSION@ -Cflags: -I${includedir}/vte-@VTE_API_VERSION@ |