summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-01-24 10:34:40 +0800
committerPo Lu <luangruo@yahoo.com>2023-01-24 10:34:40 +0800
commit4de6b187933479ce93b6079f42a485e5868f01a5 (patch)
treedb3e4cbeb5487a8397e686e9a242fdeb90fad43a /.gitignore
parent9d3aacedf0c217af207d39e390f376914160396b (diff)
downloademacs-4de6b187933479ce93b6079f42a485e5868f01a5.tar.gz
Update Android port
* .gitignore: Update with new files. Do not ignore std*.in.h. * INSTALL.android: Explain how to build Emacs with external dependencies. * Makefile.in (xcompile, cross): Rename to `cross'. (clean_dirs): Clean cross, not xcompile. * README: Document new directories. * build-aux/ndk-build-helper-1.mk (build_kind, NDK_SO_NAMES): * build-aux/ndk-build-helper-2.mk (build_kind, NDK_SO_NAMES): * build-aux/ndk-build-helper-3.mk (build_kind): * build-aux/ndk-build-helper-4.mk: * build-aux/ndk-build-helper.mk (NDK_BUILD_DIR, my-dir): * build-aux/ndk-module-extract.awk: New files. * configure.ac: Set up libgif, libwebp, and libpng for ndk-build. * cross/ndk-build/Makefile.in (srcdir, NDK_BUILD_ANDROID_MK): * cross/ndk-build/ndk-build-executable.mk: * cross/ndk-build/ndk-build-shared-library.mk (eq, objname): * cross/ndk-build/ndk-build-static-library.mk (eq, objname): * cross/ndk-build/ndk-build.in (NDK_BUILD_MODULES): * cross/ndk-build/ndk-build.mk.in (NDK_BUILD_MODULES) (NDK_BUILD_SHARED): * cross/ndk-build/ndk-clear-vars.mk: * cross/ndk-build/ndk-prebuilt-shared-library.mk: * cross/ndk-build/ndk-prebuilt-static-library.mk: New files. * doc/emacs/android.texi (Android, Android Environment): Document clipboard support on Android. * doc/emacs/emacs.texi (Top): Update menus. * etc/MACHINES: Document Android. * java/AndroidManifest.xml.in: Respect new `--with-android-debug' option. * java/Makefile.in (CROSS_BINS, CROSS_LIBS): Adjust for rename. Include ndk-build.mk.:(emacs.apk-in): Depend on shared libraries. Then, package shared libraries. * java/org/gnu/emacs/EmacsClipboard.java (EmacsClipboard): New class. * java/org/gnu/emacs/EmacsFontDriver.java: Update comment to say this is unused. * java/org/gnu/emacs/EmacsNative.java (EmacsNative): New function `sendExpose'. * java/org/gnu/emacs/EmacsSdk11Clipboard.java (EmacsSdk11Clipboard): * java/org/gnu/emacs/EmacsSdk8Clipboard.java (EmacsSdk8Clipboard): New classes. * java/org/gnu/emacs/EmacsView.java (EmacsView, handleDirtyBitmap) (onDetachedFromWindow): When window is reattached, expose the frame. * lib/Makefile.in (VPATH): (ALL_CFLAGS): Adjust for rename. * lisp/term/android-win.el (android-clipboard-exists-p) (android-get-clipboard, android-set-clipboard) (android-clipboard-owner-p, android-primary-selection) (android-get-clipboard-1, android-get-primary) (android-selection-bounds, android-encode-select-string) (gui-backend-get-selection, gui-backend-selection-exists-p) (gui-backend-selection-owner-p, gui-backend-set-selection): New functions. * m4/ndk-build.m4: New file. * src/Makefile.in (GIF_CFLAGS, ANDROID_LDFLAGS): New variables. (EMACS_CFLAGS): Add GIF_CFLAGS. Include ndk-build.mk. (libemacs.so): Depend on and link with required libraries. * src/android.c (android_check_compressed_file): New function. (android_open): Work around Android platform bug. (sendExpose): New function. (android_readdir): Set d_type if this is a directory. * src/androidgui.h (enum android_event_type) (struct android_expose_event, union android_event): Add expose events. * src/androidselect.c (struct android_emacs_clipboard) (android_init_emacs_clipboard, Fandroid_clipboard_owner_p) (Fandroid_set_clipboard, Fandroid_get_clipboard) (Fandroid_clipboard_exists_p, init_androidselect) (syms_of_androidselect): New file. * src/androidterm.c (handle_one_android_event): Handle exposures. * src/androidterm.h: Update prototypes. * src/emacs.c (android_emacs_init): Initialize androidselect.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore64
1 files changed, 34 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore
index 6494e4e8f39..6b624767c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,36 +96,40 @@ src/lisp.mk
src/verbose.mk
# Stuff built during cross compilation
-xcompile/lib/alloca.h
-xcompile/lib/assert.h
-xcompile/lib/byteswap.h
-xcompile/lib/dirent.h
-xcompile/lib/errno.h
-xcompile/lib/execinfo.h
-xcompile/lib/fcntl.h
-xcompile/lib/getopt.h
-xcompile/lib/getopt-cdefs.h
-xcompile/lib/gmp.h
-xcompile/lib/ieee754.h
-xcompile/lib/inttypes.h
-xcompile/lib/libgnu.a
-xcompile/lib/limits.h
-xcompile/lib/malloc/*.gl.h
-xcompile/lib/signal.h
-xcompile/lib/std*.h
-xcompile/!lib/std*.in.h
-xcompile/!lib/stdio-impl.h
-xcompile/lib/string.h
-xcompile/lib/sys/
-xcompile/lib/time.h
-xcompile/lib/unistd.h
-xcompile/lib/config.h
-xcompile/lib/gnulib.mk
-xcompile/src/*
-xcompile/lib-src/*
-xcompile/sys/*
-xcompile/config.status
-xcompile/*.bak
+cross/lib/alloca.h
+cross/lib/assert.h
+cross/lib/byteswap.h
+cross/lib/dirent.h
+cross/lib/errno.h
+cross/lib/execinfo.h
+cross/lib/fcntl.h
+cross/lib/getopt.h
+cross/lib/getopt-cdefs.h
+cross/lib/gmp.h
+cross/lib/ieee754.h
+cross/lib/inttypes.h
+cross/lib/libgnu.a
+cross/lib/limits.h
+cross/lib/malloc/*.gl.h
+cross/lib/signal.h
+cross/lib/std*.h
+!cross/lib/std*.in.h
+!cross/lib/stdio-impl.h
+cross/lib/string.h
+cross/lib/sys/
+cross/lib/time.h
+cross/lib/unistd.h
+cross/lib/config.h
+cross/lib/gnulib.mk
+cross/src/*
+cross/lib-src/*
+cross/sys/*
+cross/config.status
+cross/*.bak
+
+cross/ndk-build/Makefile
+cross/ndk-build/ndk-build.mk
+cross/ndk-build/*.o
# Lisp-level sources built by 'make'.
*cus-load.el