Makefile: use PYSIGROK_FLAGS only for building python bindings

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 27216608aa65ce5063b7759478604cee6a3e0c25..f536a6c140e223bf440c62fd258af9d799874b51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ 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.
 AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(TESTS_CFLAGS)
-AM_CXXFLAGS = $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)
+AM_CXXFLAGS = $(SR_WXXFLAGS) $(LIBSIGROKCXX_CFLAGS)
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -73,6 +73,8 @@ libsigrok_la_SOURCES += \
        src/input/binary.c \
        src/input/chronovu_la8.c \
        src/input/csv.c \
+       src/input/raw_analog.c \
+       src/input/trace32_ad.c \
        src/input/vcd.c \
        src/input/wav.c
 
@@ -323,11 +325,11 @@ libsigrok_la_SOURCES += \
        src/hardware/kern-scale/protocol.c \
        src/hardware/kern-scale/api.c
 endif
-if HW_KORAD_KDXXXXP
+if HW_KORAD_KAXXXXP
 libsigrok_la_SOURCES += \
-       src/hardware/korad-kdxxxxp/protocol.h \
-       src/hardware/korad-kdxxxxp/protocol.c \
-       src/hardware/korad-kdxxxxp/api.c
+       src/hardware/korad-kaxxxxp/protocol.h \
+       src/hardware/korad-kaxxxxp/protocol.c \
+       src/hardware/korad-kaxxxxp/api.c
 endif
 if HW_LASCAR_EL_USB
 libsigrok_la_SOURCES += \
@@ -335,6 +337,12 @@ libsigrok_la_SOURCES += \
        src/hardware/lascar-el-usb/protocol.c \
        src/hardware/lascar-el-usb/api.c
 endif
+if HW_LECROY_LOGICSTUDIO
+libsigrok_la_SOURCES += \
+       src/hardware/lecroy-logicstudio/protocol.h \
+       src/hardware/lecroy-logicstudio/protocol.c \
+       src/hardware/lecroy-logicstudio/api.c
+endif
 if HW_MANSON_HCS_3XXX
 libsigrok_la_SOURCES += \
        src/hardware/manson-hcs-3xxx/protocol.h \
@@ -406,6 +414,8 @@ if HW_SYSCLK_LWLA
 libsigrok_la_SOURCES += \
        src/hardware/sysclk-lwla/lwla.h \
        src/hardware/sysclk-lwla/lwla.c \
+       src/hardware/sysclk-lwla/lwla1016.c \
+       src/hardware/sysclk-lwla/lwla1034.c \
        src/hardware/sysclk-lwla/protocol.h \
        src/hardware/sysclk-lwla/protocol.c \
        src/hardware/sysclk-lwla/api.c
@@ -599,7 +609,7 @@ PDIR = bindings/python
 PDOC_START = bindings/python/sigrok/core/doc_start.i
 PDOC_END = bindings/python/sigrok/core/doc_end.i
 
-setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)'
 setup_quiet = --quiet
 setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)