Switch to a non-recursive automake setup.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 957b350c42c0437e3faf140144aadd421aaaf3ed..a7eb8f569d25cb1306286c069d64a9cbf01c348e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -109,6 +109,11 @@ AC_ARG_ENABLE(atten-pps3xxx, AC_HELP_STRING([--enable-atten-pps3xxx],
        [HW_ATTEN_PPS3XXX="$enableval"],
        [HW_ATTEN_PPS3XXX=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(brymen-bm86x, AC_HELP_STRING([--enable-brymen-bm86x],
+       [enable Brymen BM86X support [default=yes]]),
+       [HW_BRYMEN_BM86X="$enableval"],
+       [HW_BRYMEN_BM86X=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
        [enable Brymen DMM support [default=yes]]),
        [HW_BRYMEN_DMM="$enableval"],
@@ -351,10 +356,11 @@ case "$host" in
                [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
                LIBS="$LIBS $libusb_LIBS";
                SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
-               [have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
-               HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no";
-               HW_LASCAR_EL_USB="no"; HW_SYSCLK_LWLA="no";
-               HW_UNI_T_DMM="no"; HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
+               [have_libusb1_0="no"; HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
+               HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no";
+               HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no";
+               HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no";
+               HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
                HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"])
 
        # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
@@ -430,6 +436,11 @@ if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then
        AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
 fi
 
+AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes)
+if test "x$HW_BRYMEN_BM86X" = "xyes"; then
+       AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [Brymen BM86X support])
+fi
+
 AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes)
 if test "x$HW_BRYMEN_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])
@@ -600,51 +611,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR)
 AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
-AC_CONFIG_FILES([Makefile version.h hardware/Makefile
-                hardware/agilent-dmm/Makefile
-                hardware/alsa/Makefile
-                hardware/appa-55ii/Makefile
-                hardware/asix-sigma/Makefile
-                hardware/atten-pps3xxx/Makefile
-                hardware/brymen-dmm/Makefile
-                hardware/cem-dt-885x/Makefile
-                hardware/center-3xx/Makefile
-                hardware/chronovu-la8/Makefile
-                hardware/colead-slm/Makefile
-                hardware/common/Makefile
-                hardware/conrad-digi-35-cpu/Makefile
-                hardware/gmc-mh-1x-2x/Makefile
-                hardware/hameg-hmo/Makefile
-                hardware/ikalogic-scanalogic2/Makefile
-                hardware/ikalogic-scanaplus/Makefile
-                hardware/kecheng-kc-330b/Makefile
-                hardware/lascar-el-usb/Makefile
-                hardware/mic-985xx/Makefile
-                hardware/rigol-ds/Makefile
-                hardware/saleae-logic16/Makefile
-                hardware/sysclk-lwla/Makefile
-                hardware/teleinfo/Makefile
-                hardware/tondaj-sl-814/Makefile
-                hardware/victor-dmm/Makefile
-                hardware/common/dmm/Makefile
-                hardware/demo/Makefile
-                hardware/fluke-dmm/Makefile
-                hardware/fx2lafw/Makefile
-                hardware/hantek-dso/Makefile
-                hardware/link-mso19/Makefile
-                hardware/norma-dmm/Makefile
-                hardware/openbench-logic-sniffer/Makefile
-                hardware/serial-dmm/Makefile
-                hardware/uni-t-dmm/Makefile
-                hardware/uni-t-ut32x/Makefile
-                hardware/zeroplus-logic-cube/Makefile
-                input/Makefile
-                output/Makefile
-                output/text/Makefile
-                libsigrok.pc
-                contrib/Makefile
-                tests/Makefile
-               ])
+AC_CONFIG_FILES([Makefile version.h libsigrok.pc])
 
 AC_OUTPUT
 
@@ -677,6 +644,7 @@ echo "  - alsa............................ $HW_ALSA"
 echo "  - appa-55ii....................... $HW_APPA_55II"
 echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
 echo "  - atten-pps3xxx................... $HW_ATTEN_PPS3XXX"
+echo "  - brymen-bm86x.................... $HW_BRYMEN_BM86X"
 echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
 echo "  - cem-dt-885x..................... $HW_CEM_DT_885X"
 echo "  - center-3xx...................... $HW_CENTER_3XX"