aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-01-30 23:39:06 +0100
committerMax Kellermann <max@duempel.org>2015-01-31 00:05:30 +0100
commit8a6b4db19f63f95a7167ca27026cb16aa80fffad (patch)
tree59ff464849ef62f8eba89ebeab90e127673a0f5c
parentdf43b6a05cc231cd45ebf06415a8095d6ff6d98d (diff)
downloadmpd-8a6b4db19f63f95a7167ca27026cb16aa80fffad.tar.gz
mpd-8a6b4db19f63f95a7167ca27026cb16aa80fffad.tar.xz
mpd-8a6b4db19f63f95a7167ca27026cb16aa80fffad.zip
Makefile.am: move org_musicpd_Bridge.h to BUILT_SOURCES
-rw-r--r--Makefile.am4
-rw-r--r--NEWS1
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 027fe0098..89819de36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,6 @@ noinst_LIBRARIES = \
libmixer_plugins.a \
liboutput_plugins.a
-libmpd_a_DEPENDENCIES =
-
libmpd_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(LIBMPDCLIENT_CFLAGS) \
$(AVAHI_CFLAGS) \
@@ -289,7 +287,7 @@ android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java andr
android/build/include/org_musicpd_Bridge.h: android/build/bin/classes/org/musicpd/Bridge.class
javah -classpath $(ANDROID_SDK)/platforms/android-17/android.jar:android/build/bin/classes -d $(@D) org.musicpd.Bridge
-libmpd_a_DEPENDENCIES += android/build/include/org_musicpd_Bridge.h
+BUILT_SOURCES = android/build/include/org_musicpd_Bridge.h
android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml
mkdir -p $(@D)
diff --git a/NEWS b/NEWS
index ac9caacb1..da153cfa1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.19.9 (not yet released)
* fix clock integer overflow on OS X
* fix build failure with uClibc
* fix build failure on non-POSIX operating systems
+* fix dependency issue on parallel Android build
ver 0.19.8 (2015/01/14)
* input