X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=fe01e7969b168babcdac6275a1af5ab3c90e4678;hb=edb691fcedb767093885c61d19d8d490c9c8c9c2;hp=bde3b2cebf86859407bb39644f9b4f9a22532d89;hpb=7c198f968b8145321e3b7066c2a549b028a6320b;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index bde3b2ce..fe01e796 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 \ @@ -310,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 \