Use non-recursive autotools setup.

diff --git a/Makefile.am b/Makefile.am
index 5bba6ebfef12f816edde621a482fa5efb70891b7..a3bc80f0a5763f82eeebda848417869a0ebcbc14 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
 

diff --git a/configure.ac b/configure.ac
index d3f4facd3c2695a091f879d12fdd1438e9261cbc..20bc6f8cb1e540bf03052a5967ed4a7d8fafbfee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,9 @@
 AC_INIT([sigrok-androidutils], [0.1.0])
 
 AC_CONFIG_SRCDIR([src/org/sigrok/androidutils/UsbHelper.java])
-AM_INIT_AUTOMAKE
+
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AC_ARG_WITH([android-sdk],
        [AS_HELP_STRING([--with-android-sdk],
@@ -36,8 +38,9 @@ AC_ARG_WITH([android-platform],
 
 LT_INIT
 AC_PROG_CXX
+AM_PROG_CC_C_O
 
 AC_SUBST([ANDROID_SDK])
 AC_SUBST([ANDROID_PLATFORM])
 
-AC_OUTPUT([Makefile lib/Makefile lib/libsigrokandroidutils.pc])
+AC_OUTPUT([Makefile lib/libsigrokandroidutils.pc])

diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644 (file)
index e2904af..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-## This file is part of the sigrok-androidutils project.
-##
-## Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>
-##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-lib_LTLIBRARIES = libsigrokandroidutils.la
-
-libsigrokandroidutils_la_CXXFLAGS = -fno-exceptions
-
-libsigrokandroidutils_la_SOURCES = \
-       jvm_glue.cpp \
-       envsetup.cpp
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libsigrokandroidutils.pc
-
-library_includedir = $(includedir)/libsigrokandroidutils
-library_include_HEADERS = libsigrokandroidutils.h
-noinst_HEADERS = libsigrokandroidutils-internal.h