.gitignore: Update.

[sigrok-androidutils.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5bba6ebfef12f816edde621a482fa5efb70891b7..4df180cdd5ef34d4dc2fb78ec0047c1f0fd76008 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,21 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-SUBDIRS = lib
+lib_LTLIBRARIES = libsigrokandroidutils.la
+
+libsigrokandroidutils_la_CXXFLAGS = \
+       -fno-exceptions
+
+libsigrokandroidutils_la_SOURCES = \
+       lib/jvm_glue.cpp \
+       lib/envsetup.cpp
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lib/libsigrokandroidutils.pc
+
+library_includedir = $(includedir)/libsigrokandroidutils
+library_include_HEADERS = lib/libsigrokandroidutils.h
+noinst_HEADERS = lib/libsigrokandroidutils-internal.h
 
 dist_pkgdata_DATA = device_filter.xml
 
@@ -33,10 +47,10 @@ ANTFLAGS = -Dandroid.sdk=$(ANDROID_SDK) -Dandroid.platform=$(ANDROID_PLATFORM)
 EXTRA_DIST = build.xml src ant/src ant/resources
 
 $(UTILS_JAR): always
-       @ant $(ANTFLAGS) utils
+       $(AM_V_GEN)ant -S -q $(ANTFLAGS) utils
 
 $(ANTTASKS_JAR): always
-       @ant anttasks
+       $(AM_V_GEN)ant -S -q anttasks
 
 clean-local:
        -rm -rf build ant/build