clean up autoconf/autobuild scripts

diff --git a/configure.ac b/configure.ac
index 941268cce630012949394c20a8865ba03d9325af..054b26dbd0880323d93b64ec389ce7b052b6eb70 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,15 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
        AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
+AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
+             [enable demo driver support [default=yes]]),
+             [LA_DEMO="$enableval"],
+             [LA_DEMO=yes])
+AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes)
+if test "x$LA_DEMO" = "xyes"; then
+       AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support])
+fi
+
 AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
              [Enable Fluke DMM support. [default=yes]]),
              [HW_FLUKE_DMM="$enableval"],
@@ -123,15 +132,6 @@ if test "x$HW_FLUKE_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
 fi
 
-AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
-             [Enable Radio Shack DMM support. [default=yes]]),
-             [HW_RADIOSHACK_DMM="$enableval"],
-             [HW_RADIOSHACK_DMM=yes])
-AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
-if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [Radioshack DMM support])
-       fi
-
 AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
              [enable fx2lafw support (for FX2 LAs). [default=yes]]),
              [LA_FX2LAFW="$enableval"],
@@ -150,13 +150,14 @@ if test "x$HW_GENERICDMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support])
 fi
 
-AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
-             [enable demo driver support [default=yes]]),
-             [LA_DEMO="$enableval"],
-             [LA_DEMO=yes])
-AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes)
-if test "x$LA_DEMO" = "xyes"; then
-       AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support])
+AC_ARG_ENABLE(hantek-dso,
+             AC_HELP_STRING([--enable-hantek-dso],
+             [enable Hantek DSO support [default=yes]]),
+             [HW_HANTEK_DSO="$enableval"],
+             [HW_HANTEK_DSO=yes])
+AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
+if test "x$HW_HANTEK_DSO" = "xyes"; then
+       AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
 # Disabled by default, unfinished.
@@ -178,6 +179,15 @@ if test "x$LA_OLS" = "xyes"; then
        AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 fi
 
+AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
+             [Enable Radio Shack DMM support. [default=yes]]),
+             [HW_RADIOSHACK_DMM="$enableval"],
+             [HW_RADIOSHACK_DMM=yes])
+AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
+if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [Radioshack DMM support])
+fi
+
 AC_ARG_ENABLE(zeroplus-logic-cube,
              AC_HELP_STRING([--enable-zeroplus-logic-cube],
              [enable ZEROPLUS Logic Cube support [default=yes]]),
@@ -188,16 +198,6 @@ if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
        AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
 fi
 
-AC_ARG_ENABLE(hantek-dso,
-             AC_HELP_STRING([--enable-hantek-dso],
-             [enable Hantek DSO support [default=yes]]),
-             [HW_HANTEK_DSO="$enableval"],
-             [HW_HANTEK_DSO=yes])
-AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
-if test "x$HW_HANTEK_DSO" = "xyes"; then
-       AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
-fi
-
 # Checks for libraries.
 
 # This variable collects the pkg-config names of all detected libs.
@@ -313,9 +313,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
+AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/agilent-dmm/Makefile
                 hardware/alsa/Makefile
                 hardware/asix-sigma/Makefile
@@ -323,13 +321,13 @@ AC_CONFIG_FILES([Makefile
                 hardware/common/Makefile
                 hardware/demo/Makefile
                 hardware/fluke-dmm/Makefile
-                hardware/radioshack-dmm/Makefile
                 hardware/fx2lafw/Makefile
                 hardware/genericdmm/Makefile
+                hardware/hantek-dso/Makefile
                 hardware/link-mso19/Makefile
                 hardware/openbench-logic-sniffer/Makefile
+                hardware/radioshack-dmm/Makefile
                 hardware/zeroplus-logic-cube/Makefile
-                hardware/hantek-dso/Makefile
                 input/Makefile
                 output/Makefile
                 output/text/Makefile
@@ -360,20 +358,18 @@ for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "a
        echo "  - $lib: $answer"
 done
 
-echo
-echo "Enabled hardware drivers:"
-echo
+echo -e "\nEnabled hardware drivers:\n"
 echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
 echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
 echo "  - Demo driver..................... $LA_DEMO"
 echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
-echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
 echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Generic DMM..................... $HW_GENERICDMM"
+echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
+echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
 echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
-echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo
 

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 029a222e29bf913ef33f278c9af4e4c152f367c8..0d907ab3e6a4aa9267c2b5d6eb3da35bd89614b5 100644 (file)
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -28,11 +28,11 @@ SUBDIRS = \
        fluke-dmm \
        fx2lafw \
        genericdmm \
+       hantek-dso \
        link-mso19 \
        openbench-logic-sniffer \
-       zeroplus-logic-cube \
-       hantek-dso \
-       radioshack-dmm
+       radioshack-dmm \
+       zeroplus-logic-cube
 
 noinst_LTLIBRARIES = libsigrokhardware.la
 
@@ -65,10 +65,6 @@ if HW_FLUKE_DMM
 libsigrokhardware_la_LIBADD += fluke-dmm/libsigrokhwflukedmm.la
 endif
 
-if HW_RADIOSHACK_DMM
-libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
-endif
-
 if LA_FX2LAFW
 libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la
 endif
@@ -77,6 +73,10 @@ if HW_GENERICDMM
 libsigrokhardware_la_LIBADD += genericdmm/libsigrokhwgenericdmm.la
 endif
 
+if HW_HANTEK_DSO
+libsigrokhardware_la_LIBADD += hantek-dso/libsigrokhw_hantek_dso.la
+endif
+
 if LA_LINK_MSO19
 libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
 endif
@@ -85,11 +85,11 @@ if LA_OLS
 libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
 endif
 
-if LA_ZEROPLUS_LOGIC_CUBE
-libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrokhwzeroplus.la
+if HW_RADIOSHACK_DMM
+libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
 endif
 
-if HW_HANTEK_DSO
-libsigrokhardware_la_LIBADD += hantek-dso/libsigrokhw_hantek_dso.la
+if LA_ZEROPLUS_LOGIC_CUBE
+libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrokhwzeroplus.la
 endif