X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=fb925ce6a1a530ddcb063bc92830dd95cc450f1d;hb=ce3e1e6132d7f6242f10bc8b8e205a6714451321;hp=c866213480c0da3c8acaeda56801b1cf09d890ae;hpb=3182d4ebb3618e8745e83650f2568bf42d612f93;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index c8662134..fb925ce6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,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) -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. @@ -51,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 \ @@ -262,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 \ @@ -304,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 \ @@ -505,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)