1 files changed, 72 insertions, 32 deletions

diff --git a/java/Makefile.in b/java/Makefile.in
index 155754b59d2..fc0d23980e4 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -54,18 +54,33 @@ JARSIGNER_FLAGS =
 endif
 
 SIGN_EMACS = -keystore emacs.keystore -storepass emacs1 $(JARSIGNER_FLAGS)
-SIGN_EMACS_V2 = sign --v2-signing-enabled --ks emacs.keystore \
+SIGN_EMACS_V2 = sign --v2-signing-enabled --ks emacs.keystore   \
         --debuggable-apk-permitted --ks-pass pass:emacs1
 
-JAVA_FILES = $(wildcard $(srcdir)/org/gnu/emacs/*.java)
-RESOURCE_FILES = $(wildcard $(srcdir)/res/drawable/*)
-CLASS_FILES = $(foreach file,$(JAVA_FILES),$(basename $(file)).class)
+JAVA_FILES := $(wildcard $(srcdir)/org/gnu/emacs/*.java)
+RESOURCE_FILES := $(foreach file,$(wildcard $(srcdir)/res/*),   \
+                    $(wildcard $(file)/*))
+
+# R.java is a file generated by the `aapt' utility containing
+# constants that can then be used to locate ``resource identifiers''.
+# It is not a regular file and should not be compiled as Java source
+# code.  Instead, it is automatically included by the Java compiler.
+RESOURCE_FILE := $(srcdir)/org/gnu/emacs/R.java
+
+# CLASS_FILES is what should actually be built and included in the
+# resulting Emacs executable.  The Java compiler might generate more
+# than one class file for each source file, so this only serves as a
+# list of dependencies for Make.
+CLASS_FILES := $(foreach file,$(JAVA_FILES),$(basename $(file)).class)
+
+# Remove RESOURCE_FILE from JAVA_FILES, if it is already present.
+JAVA_FILES := $(filter-out $(RESOURCE_FILE),$(JAVA_FILES))
 
 # Compute the name for the Emacs application package.  This should be:
 # emacs-<version>-<min-sdk>-<abi>.apk
 
-ANDROID_MIN_SDK = @ANDROID_MIN_SDK@
-APK_NAME = emacs-$(version)-$(ANDROID_MIN_SDK)-$(ANDROID_ABI).apk
+ANDROID_MIN_SDK := @ANDROID_MIN_SDK@
+APK_NAME := emacs-$(version)-$(ANDROID_MIN_SDK)-$(ANDROID_ABI).apk
 
 # How this stuff works.
 
@@ -113,19 +128,25 @@ include $(top_builddir)/cross/ndk-build/ndk-build.mk
 $(libsrc)/asset-directory-tool:
         $(MAKE) -C $(libsrc) $(notdir $@)
 
-emacs.apk-in: $(CROSS_BINS) $(CROSS_LIBS) $(libsrc)/asset-directory-tool \
-  AndroidManifest.xml $(NDK_BUILD_SHARED) $(RESOURCE_FILES)
+# install_tmp is a directory used to generate emacs.apk-in.
+# That is then packaged into $(APK_NAME).
+
+.PHONY: install_temp install_temp/assets/directory-tree
+install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(NDK_BUILD_SHARED)   \
+  $(RESOURCE_FILES)
+        $(AM_V_GEN)
 # Make the working directory for this stuff
-        rm -rf install_temp
-        mkdir -p install_temp/lib/$(ANDROID_ABI)
-        mkdir -p install_temp/assets/etc
-        mkdir -p install_temp/assets/lisp
-        mkdir -p install_temp/assets/info
+        $(AM_V_SILENT) rm -rf install_temp
+        $(AM_V_SILENT) mkdir -p install_temp/lib/$(ANDROID_ABI)
+        $(AM_V_SILENT) mkdir -p install_temp/assets/etc
+        $(AM_V_SILENT) mkdir -p install_temp/assets/lisp
+        $(AM_V_SILENT) mkdir -p install_temp/assets/info
 # Install architecture independents to assets/etc and assets/lisp
-        cp -r $(top_builddir)/lisp install_temp/assets
-        cp -r $(top_builddir)/etc install_temp/assets
-        cp -r $(top_builddir)/info install_temp/assets
+        $(AM_V_SILENT) cp -r $(top_builddir)/lisp install_temp/assets
+        $(AM_V_SILENT) cp -r $(top_builddir)/etc install_temp/assets
+        $(AM_V_SILENT) cp -r $(top_builddir)/info install_temp/assets
 # Remove undesirable files from those directories.
+        $(AM_V_SILENT)                                          \
         for subdir in `find install_temp -type d -print`; do    \
           chmod a+rx $${subdir} ;                               \
           rm -rf $${subdir}/.gitignore ;                        \
@@ -139,34 +160,44 @@ emacs.apk-in: $(CROSS_BINS) $(CROSS_LIBS) $(libsrc)/asset-directory-tool \
           rm -rf $${subdir}/Makefile;                           \
         done
 # Generate the directory tree for those directories.
-        $(libsrc)/asset-directory-tool install_temp/assets      \
-          install_temp/assets/directory-tree
 # Install architecture dependents to lib/$(ANDROID_ABI).  This
 # perculiar naming scheme is required to make Android preserve these
 # binaries upon installation.
+        $(AM_V_SILENT)                                                          \
         for file in $(CROSS_BINS); do                                           \
           if [ -x $$file ]; then                                                \
             filename=`basename $$file`;                                         \
             cp -f $$file install_temp/lib/$(ANDROID_ABI)/lib$${filename}.so;    \
           fi                                                                    \
         done
+        $(AM_V_SILENT)                                          \
         for file in $(CROSS_LIBS); do                           \
           if [ -x $$file ]; then                                \
             cp -f $$file install_temp/lib/$(ANDROID_ABI);       \
           fi                                                    \
         done
 ifneq ($(NDK_BUILD_SHARED),)
-        cp -f $(NDK_BUILD_SHARED) install_temp/lib/$(ANDROID_ABI)
+        $(AM_V_SILENT) cp -f $(NDK_BUILD_SHARED) \
+          install_temp/lib/$(ANDROID_ABI)
 endif
+
+install_temp/assets/directory-tree: $(libsrc)/asset-directory-tool install_temp
+        $(AM_V_GEN) $(libsrc)/asset-directory-tool install_temp/assets \
+          install_temp/assets/directory-tree
+
+emacs.apk-in: install_temp install_temp/assets/directory-tree \
+        AndroidManifest.xml
 # Package everything.  Specifying the assets on this command line is
 # necessary for AAssetManager_getNextFileName to work on old versions
-# of Android.  Make sure not to generate R.java, as it's not required
-# by Emacs.
-        $(AAPT) package -I "$(ANDROID_JAR)" -F $@ -f    \
-          -M AndroidManifest.xml -A install_temp/assets \
+# of Android.  Make sure not to generate R.java, as it's already been
+# generated.
+        $(AM_V_AAPT) $(AAPT) p -I "$(ANDROID_JAR)" -F $@   \
+          -f -M AndroidManifest.xml -A install_temp/assets \
           -S res -J install_temp
-        pushd install_temp; $(AAPT) add ../$@ `find lib -type f`; popd
-        rm -rf install_temp
+        $(AM_V_SILENT) pushd install_temp &> /dev/null; \
+          $(AAPT) add ../$@ `find lib -type f`;         \
+        popd &> /dev/null
+        $(AM_V_SILENT) rm -rf install_temp
 
 # Makefile itself.
 .PRECIOUS: ../config.status Makefile
@@ -180,6 +211,14 @@ AndroidManifest.xml: $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4 \
   AndroidManifest.xml.in
         pushd ..; ./config.status java/AndroidManifest.xml; popd
 
+# R.java:
+$(RESOURCE_FILE): $(RESOURCE_FILES)
+        $(AM_V_GEN) $(AAPT) p -I "$(ANDROID_JAR)" -f \
+          -J $(dir $@) -M AndroidManifest.xml -S res
+
+# Make all class files depend on R.java being built.
+$(CLASS_FILES): $(RESOURCE_FILE)
+
 .SUFFIXES: .java .class
 .java.class &:
         $(AM_V_JAVAC) $(JAVAC) $(JAVAFLAGS) $<
@@ -199,17 +238,18 @@ classes.dex: $(CLASS_FILES)
 .PHONY: clean maintainer-clean
 
 $(APK_NAME): classes.dex emacs.apk-in emacs.keystore
-        cp -f emacs.apk-in $@.unaligned
-        $(AAPT) add $@.unaligned classes.dex
-        $(JARSIGNER) $(SIGN_EMACS) $@.unaligned "Emacs keystore"
-        $(ZIPALIGN) -f 4 $@.unaligned $@
+        $(AM_V_GEN)
+        $(AM_V_SILENT) cp -f emacs.apk-in $@.unaligned
+        $(AM_V_SILENT) $(AAPT) add $@.unaligned classes.dex
+        $(AM_V_SILENT) $(JARSIGNER) $(SIGN_EMACS) $@.unaligned "Emacs keystore"
+        $(AM_V_SILENT) $(ZIPALIGN) -f 4 $@.unaligned $@
 # Signing must happen after alignment!
-        $(APKSIGNER) $(SIGN_EMACS_V2) $@
-        rm -f $@.unaligned *.idsig
+        $(AM_V_SILENT) $(APKSIGNER) $(SIGN_EMACS_V2) $@
+        $(AM_V_SILENT) rm -f $@.unaligned *.idsig
 
 clean:
         rm -f *.apk emacs.apk-in *.dex *.unaligned *.class *.idsig
-        rm -rf install-temp
+        rm -rf install-temp $(RESOURCE_FILE)
         find . -name '*.class' -delete
 
 maintainer-clean distclean bootstrap-clean: clean