Makefile.am: rename JAVA_SOURCES to JAVA_SOURCE_PATHS

Work around automake warning: Makefile.am:310: warning: variable 'JAVA_SOURCES' is defined but no program or Makefile.am:310: library has 'JAVA' as canonical name (possible typo) Closes #195

Makefile.am: rename JAVA_SOURCES to JAVA_SOURCE_PATHS
92f09bba · Max Kellermann · 1f50bdb2 · 92f09bba
Commit 92f09bba authored Jan 18, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile.am Makefile.am +2 -2

No files found.
--- a/Makefile.am
+++ b/Makefile.am
@@ -307,7 +307,7 @@ ANDROID_XML_RES := $(wildcard $(srcdir)/android/res/*/*.xml)
 ANDROID_XML_RES_COPIES := $(patsubst $(srcdir)/android/%,android/build/%,$(ANDROID_XML_RES))

 JAVA_SOURCE_NAMES = Bridge.java Loader.java Main.java
-JAVA_SOURCES = $(addprefix $(srcdir)/android/src/,$(JAVA_SOURCE_NAMES))
+JAVA_SOURCE_PATHS = $(addprefix $(srcdir)/android/src/,$(JAVA_SOURCE_NAMES))

 JAVA_CLASSFILES_DIR = android/build/classes

@@ -328,7 +328,7 @@ android/build/resources.apk: $(ANDROID_XML_RES_COPIES) android/build/res/drawabl
 # R.java is generated by aapt, when resources.apk is generated
 android/build/gen/org/musicpd/R.java: android/build/resources.apk

-android/build/classes.dex: $(JAVA_SOURCES) android/build/gen/org/musicpd/R.java
+android/build/classes.dex: $(JAVA_SOURCE_PATHS) android/build/gen/org/musicpd/R.java
 	@$(MKDIR_P) $(JAVA_CLASSFILES_DIR)
 	$(JAVAC) -source 1.5 -target 1.5 -Xlint:-options \
 		-cp $(ANDROID_SDK_PLATFORM_DIR)/android.jar:$(JAVA_CLASSFILES_DIR) \