diff options
| author | Max Kellermann <max@duempel.org> | 2015-02-06 17:15:31 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-02-06 17:15:31 +0100 |
| commit | ff2b427cc139adbf20e684db69dab9305c91c212 (patch) | |
| tree | 8d95220da3458fc4fa741a5775bcb0bf98296127 /Makefile.am | |
| parent | a62fe305464c6815dca7139dcb0cb689fcdfbaa1 (diff) | |
| parent | 5761800197a86ba6de70af026546e678cbda4b91 (diff) | |
| download | mpd-ff2b427cc139adbf20e684db69dab9305c91c212.tar.gz mpd-ff2b427cc139adbf20e684db69dab9305c91c212.tar.xz mpd-ff2b427cc139adbf20e684db69dab9305c91c212.zip | |
Merge tag 'v0.19.9'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1743c48f4..1f263e6d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,8 +29,6 @@ noinst_LIBRARIES = \ libmixer_plugins.a \ liboutput_plugins.a -libmpd_a_DEPENDENCIES = - libmpd_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(LIBMPDCLIENT_CFLAGS) \ $(AVAHI_CFLAGS) \ @@ -289,13 +287,13 @@ android/build/build.xml: android/AndroidManifest.xml ln -s $(abs_srcdir)/android/res/values $(abs_srcdir)/android/res/layout android/build/res $(ANDROID_SDK)/tools/android update project --path android/build --target android-17 --name $(APK_NAME) -android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml +android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml android/build/res/drawable/icon.png cd android/build && ant compile-jni-classes 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) |