X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=fb925ce6a1a530ddcb063bc92830dd95cc450f1d;hb=6b71bf1ba076f697bde8e41dbaa413bb3ec44326;hp=b32515a74fd4223f938f5c4a58bbcffded953619;hpb=fd31865ef42ad6b48f47a616c1aebd9e5b4c1ec1;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index b32515a7..fb925ce6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --silent
+GNUMAKEFLAGS = --no-print-directory
 
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
@@ -27,8 +28,14 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
 if BINDINGS_CXX
 local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx
 endif
+# Do not hard-code the firmware location on Windows.
+if WIN32
+global_defs =
+else
+global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+endif
 # Ensure that local include directories are always searched first.
-AM_CPPFLAGS = $(local_includes) -D_POSIX_C_SOURCE=200112L -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = $(local_includes) $(global_defs)
 
 # The tests CFLAGS are a superset of the libsigrok CFLAGS, and the
 # python bindings CFLAGS are a superset of the C++ bindings CFLAGS.
@@ -50,6 +57,7 @@ libsigrok_la_SOURCES = \
 	src/soft-trigger.c \
 	src/analog.c \
 	src/fallback.c \
+	src/resource.c \
 	src/strutil.c \
 	src/log.c \
 	src/version.c \
@@ -261,6 +269,12 @@ libsigrok_la_SOURCES += \
 	src/hardware/gmc-mh-1x-2x/protocol.c \
 	src/hardware/gmc-mh-1x-2x/api.c
 endif
+if HW_GWINSTEK_GDS_800
+libsigrok_la_SOURCES += \
+	src/hardware/gwinstek-gds-800/protocol.h \
+	src/hardware/gwinstek-gds-800/protocol.c \
+	src/hardware/gwinstek-gds-800/api.c
+endif
 if HW_HAMEG_HMO
 libsigrok_la_SOURCES += \
 	src/hardware/hameg-hmo/protocol.h \
@@ -273,6 +287,12 @@ libsigrok_la_SOURCES += \
 	src/hardware/hantek-dso/dso.c \
 	src/hardware/hantek-dso/api.c
 endif
+if HW_HUNG_CHANG_DSO_2100
+libsigrok_la_SOURCES += \
+	src/hardware/hung-chang-dso-2100/protocol.h \
+	src/hardware/hung-chang-dso-2100/protocol.c \
+	src/hardware/hung-chang-dso-2100/api.c
+endif
 if HW_IKALOGIC_SCANALOGIC2
 libsigrok_la_SOURCES += \
 	src/hardware/ikalogic-scanalogic2/protocol.h \
@@ -297,6 +317,12 @@ libsigrok_la_SOURCES += \
 	src/hardware/kern-scale/protocol.c \
 	src/hardware/kern-scale/api.c
 endif
+if HW_KORAD_KDXXXXP
+libsigrok_la_SOURCES += \
+	src/hardware/korad-kdxxxxp/protocol.h \
+	src/hardware/korad-kdxxxxp/protocol.c \
+	src/hardware/korad-kdxxxxp/api.c
+endif
 if HW_LASCAR_EL_USB
 libsigrok_la_SOURCES += \
 	src/hardware/lascar-el-usb/protocol.h \
@@ -498,7 +524,8 @@ tests_main_SOURCES = \
 	tests/version.c \
 	tests/driver_all.c \
 	tests/device.c \
-	tests/trigger.c
+	tests/trigger.c \
+	tests/analog.c
 
 tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 
@@ -575,7 +602,7 @@ $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
 		$(library_include_HEADERS) $(nodist_library_include_HEADERS) \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
-		| bindings/cxx/libsigrokcxx.la
+		@ORDER@ bindings/cxx/libsigrokcxx.la
 	$(AM_V_at)$(setup_py) clean --all 2>/dev/null
 	$(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" build_py
 	$(AM_V_at): >$@
@@ -636,7 +663,7 @@ $(JLIB): $(JCXX) \
 		$(library_include_HEADERS) $(nodist_library_include_HEADERS) \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
-		| bindings/cxx/libsigrokcxx.la
+		@ORDER@ bindings/cxx/libsigrokcxx.la
 	$(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \
 		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
 		-lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB)
@@ -668,7 +695,7 @@ MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 ChangeLog:
-	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+	git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
 
 dist-hook: ChangeLog