BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add per-LA --enable-XXXX configure options.

This commit is contained in:
Uwe Hermann 2010-05-31 11:34:10 +02:00
parent 38ba252251
commit 5b907f9b07
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -34,8 +34,6 @@ libsigrok_la_SOURCES = \
hardware/common/serial.c \ hardware/common/serial.c \
hardware/openbench-logic-sniffer/ols.c \ hardware/openbench-logic-sniffer/ols.c \
hardware/saleae-logic/saleae-logic.c \ hardware/saleae-logic/saleae-logic.c \
hardware/asix-sigma/asix-sigma.c \
hardware/asix-sigma/asix-sigma.h \
hardware/zeroplus-logic-cube/analyzer.c \ hardware/zeroplus-logic-cube/analyzer.c \
hardware/zeroplus-logic-cube/analyzer.h \ hardware/zeroplus-logic-cube/analyzer.h \
hardware/zeroplus-logic-cube/gl_usb.c \ hardware/zeroplus-logic-cube/gl_usb.c \
@ -50,6 +48,16 @@ libsigrok_la_SOURCES = \
output/common.c \ output/common.c \
output/output.c output/output.c
if LA_ASIX_SIGMA
libsigrok_la_SOURCES += \
hardware/asix-sigma/asix-sigma.c \
hardware/asix-sigma/asix-sigma.h
else
EXTRA_DIST = \
hardware/asix-sigma/asix-sigma.c \
hardware/asix-sigma/asix-sigma.h
endif
libsigrok_la_LIBADD = $(LIBOBJS) libsigrok_la_LIBADD = $(LIBOBJS)
include_HEADERS = sigrok.h include_HEADERS = sigrok.h

4
hwplugin.c
View File

@ -43,7 +43,9 @@ struct hwcap_option hwcap_options[] = {
extern struct device_plugin saleae_logic_plugin_info; extern struct device_plugin saleae_logic_plugin_info;
extern struct device_plugin ols_plugin_info; extern struct device_plugin ols_plugin_info;
extern struct device_plugin zeroplus_logic_cube_plugin_info; extern struct device_plugin zeroplus_logic_cube_plugin_info;
#ifdef HAVE_LA_ASIX_SIGMA
extern struct device_plugin asix_sigma_plugin_info; extern struct device_plugin asix_sigma_plugin_info;
#endif
/* TODO: No linked list needed, this can be a simple array. */ /* TODO: No linked list needed, this can be a simple array. */
int load_hwplugins(void) int load_hwplugins(void)
@ -53,7 +55,9 @@ int load_hwplugins(void)
plugins = g_slist_append(plugins, (gpointer *)&ols_plugin_info); plugins = g_slist_append(plugins, (gpointer *)&ols_plugin_info);
plugins = g_slist_append(plugins, plugins = g_slist_append(plugins,
(gpointer *)&zeroplus_logic_cube_plugin_info); (gpointer *)&zeroplus_logic_cube_plugin_info);
#ifdef HAVE_LA_ASIX_SIGMA
plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info); plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info);
#endif
return SIGROK_OK; return SIGROK_OK;
} }