Makefile.am: Use $(MKDIR_P) everywhere.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6491d068b0119afe9c58c92be1149662087ed98d..664a58f527089a6bc5aa4bb976d95dc132971fd5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ libsigrok_la_SOURCES = \
        src/hwdriver.c \
        src/trigger.c \
        src/soft-trigger.c \
+       src/analog.c \
+       src/fallback.c \
        src/strutil.c \
        src/log.c \
        src/version.c \
@@ -63,6 +65,7 @@ libsigrok_la_SOURCES += \
        src/output/gnuplot.c \
        src/output/hex.c \
        src/output/ols.c \
+       src/output/srzip.c \
        src/output/vcd.c
 
 # SCPI support
@@ -104,11 +107,14 @@ libsigrok_la_SOURCES += \
        src/dmm/m2110.c \
        src/dmm/metex14.c \
        src/dmm/rs9lcd.c \
-       src/dmm/bm25x.c
+       src/dmm/bm25x.c \
+       src/dmm/ut71x.c
 
 # Hardware (LCR chip parsers)
+if HW_DEREE_DE5000
 libsigrok_la_SOURCES += \
        src/lcr/es51919.c
+endif
 
 # Hardware drivers
 if HW_AGILENT_DMM
@@ -188,6 +194,10 @@ if HW_DEMO
 libsigrok_la_SOURCES += \
        src/hardware/demo/demo.c
 endif
+if HW_DEREE_DE5000
+libsigrok_la_SOURCES += \
+       src/hardware/deree-de5000/api.c
+endif
 if HW_FLUKE_DMM
 libsigrok_la_SOURCES += \
        src/hardware/fluke-dmm/fluke-dmm.h \
@@ -410,7 +420,9 @@ tests_check_main_SOURCES = \
        tests/check_session.c \
        tests/check_strutil.c \
        tests/check_version.c \
-       tests/check_driver_all.c
+       tests/check_driver_all.c \
+       tests/check_device.c \
+       tests/check_trigger.c
 
 tests_check_main_CFLAGS = @check_CFLAGS@
 
@@ -476,7 +488,7 @@ PDIR = bindings/python
 PDOC = bindings/python/sigrok/core/doc.i
 
 $(PDOC): bindings/swig/doc.py $(CPPXMLDOC)
-       $(AM_V_at)test -d $(PDIR)/sigrok/core || mkdir -p $(PDIR)/sigrok/core
+       $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
        $(AM_V_GEN)$(PYTHON) $< python $(CPPXMLDOC) > $@
 
 python-build: $(PDIR)/timestamp
@@ -492,8 +504,11 @@ $(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
                | grep -v "command line option.*Wstrict-prototypes"; true
        $(AM_V_at)touch $(PDIR)/timestamp
 
-python-install:
-       cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix)
+$(DESTDIR)$(prefix):
+       $(MKDIR_P) $@
+
+python-install: $(DESTDIR)$(prefix)
+       cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) `test "$(DESTDIR)" && echo --root=$(DESTDIR)`
 
 python-clean:
        $(AM_V_at)$(MAKE) python-quietclean
@@ -525,7 +540,7 @@ JJAR = $(JDIR)/sigrok-core.jar
 java-build: $(JJAR) $(JLIB)
 
 $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
-       $(AM_V_at)test -d $(JCLS) || mkdir -p $(JCLS)
+       $(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS)
        $(AM_V_GEN)python $< java $(CPPXMLDOC) > $@
 
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)