resource: New internal API for accessing resource files

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b2c307e7011ccb6b08d5cf348ab676cd17194dae..06832cae32d5703134f88ebfeb805d0584c5892e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ if BINDINGS_CXX
 local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx
 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) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 # 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 +51,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 +263,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 \
@@ -675,7 +682,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