e3b50ec8ec
* INSTALL.android: Document support for gnutls and libgmp. * build-aux/ndk-build-helper-1.mk (NDK_SO_NAMES, NDK_INCLUDES) (SYSTEM_LIBRARIES): * build-aux/ndk-build-helper-2.mk: Recursively resolve and add shared library dependencies; even those of static libraries. * build-aux/ndk-module-extract.awk: Fix makefile_imports code. * configure.ac (ANDROID_SDK_18_OR_EARLIER, XCONFIGURE) (LIBGMP_CFLAGS): Enable GMP and gnutls on Android. * cross/ndk-build/Makefile.in (LOCAL_EXPORT_C_INCLUDES): * cross/ndk-build/ndk-build-shared-library.mk: ($(call objname,$(LOCAL_MODULE),$(basename $(1))))::($$(error Unsupported suffix)::($(LOCAL_MODULE_FILENAME)): * cross/ndk-build/ndk-build-static-library.mk: ($(call objname,$(LOCAL_MODULE),$(basename $(1))))::($$(error Unsupported suffix): * cross/ndk-build/ndk-clear-vars.mk: * cross/ndk-build/ndk-resolve.mk (NDK_SYSTEM_LIBRARIES): (NDK_LOCAL_EXPORT_C_INCLUDES_$(LOCAL_MODULE)): (NDK_SO_EXTRA_FLAGS_$(LOCAL_MODULE)): Implement ``LOCAL_ASM_RULE'' and ``LOCAL_C_ADDITIONAL_FLAGS'' extensions for libgmp. * doc/emacs/input.texi (Touchscreens): Document how to horizontally scroll. * java/org/gnu/emacs/EmacsActivity.java (attachWindow): Give the view focus again if necessary. (onPause): Call right super function. * java/org/gnu/emacs/EmacsPreferencesActivity.java (onClick): Clear dumpFileName lest Emacs try to load a nonexistent dump file. * java/org/gnu/emacs/EmacsView.java (onDetachedFromWindow) (onAttachedToWindow): Call super functions. (onCreateInputConnection): Make sure the IME never obscures Emacs. * java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, onKeyDown) (onKeyUp): Improve tracking of quit keys. * lisp/isearch.el (isearch-mode): Bring up the onscreen keyboard. * lisp/touch-screen.el (touch-screen-current-tool): Add three fields. (touch-screen-handle-scroll): Allow hscrolling as well. (touch-screen-handle-touch): Add additional fields to `touch-screen-current-tool'. * src/Makefile.in (LIBGMP_CFLAGS, EMACS_CFLAGS): Add new variable. * src/android.c (android_run_select_thread): (android_write_event): Use pthread_cond_broadcast because pthread_cond_signal does nothing on some Android versions/devices?
88 lines
1.6 KiB
Awk
88 lines
1.6 KiB
Awk
/^Building.+$/ {
|
|
kind = $2
|
|
}
|
|
|
|
/^Start Imports$/ {
|
|
imports = 1
|
|
}
|
|
|
|
// {
|
|
if (imports && ++imports > 2)
|
|
{
|
|
if (!match ($0, /^End Imports$/))
|
|
makefile_imports = makefile_imports " " $0
|
|
}
|
|
else if (!match ($0, /^End$/) && !match ($0, /^Building.+$/))
|
|
{
|
|
if (kind)
|
|
{
|
|
if (target_found)
|
|
cxx_deps = $0
|
|
else if (ldflags_found)
|
|
{
|
|
target = $0
|
|
target_found = 1
|
|
}
|
|
else if (cflags_found)
|
|
{
|
|
ldflags = $0
|
|
ldflags_found = 1
|
|
}
|
|
else if (includes_found)
|
|
{
|
|
cflags = $0
|
|
cflags_found = 1
|
|
}
|
|
else if (src_found)
|
|
{
|
|
includes = $0
|
|
includes_found = 1
|
|
}
|
|
else if (name_found)
|
|
{
|
|
src = $0
|
|
src_found = 1;
|
|
}
|
|
else
|
|
{
|
|
name = $0
|
|
name_found = 1
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/^End$/ {
|
|
if (name == MODULE && (kind == "shared" || kind == "static"))
|
|
{
|
|
printf "module_name=%s\n", name
|
|
printf "module_kind=%s\n", kind
|
|
printf "module_src=\"%s\"\n", src
|
|
printf "module_includes=\"%s\"\n", includes
|
|
printf "module_cflags=\"%s\"\n", cflags
|
|
printf "module_ldflags=\"%s\"\n", ldflags
|
|
printf "module_target=\"%s\"\n", target
|
|
printf "module_cxx_deps=\"%s\"\n", cxx_deps
|
|
}
|
|
|
|
src = ""
|
|
name = ""
|
|
kind = ""
|
|
includes = ""
|
|
cflags = ""
|
|
ldflags = ""
|
|
name_found = ""
|
|
src_found = ""
|
|
includes_found = ""
|
|
cflags_found = ""
|
|
ldflags_found = ""
|
|
target_found = ""
|
|
}
|
|
|
|
/^End Imports$/ {
|
|
imports = ""
|
|
# Strip off leading whitespace.
|
|
gsub (/^[ \t]+/, "", makefile_imports)
|
|
printf "module_imports=\"%s\"\n", makefile_imports
|
|
makefile_imports = ""
|
|
}
|