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

configure: Add --enable-demo option.

This commit is contained in:
Uwe Hermann 2011-01-11 22:17:33 +01:00
parent 1fdb75e145
commit a61b0e6a35
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hardware/Makefile.am
View File

@ -31,8 +31,11 @@ noinst_LTLIBRARIES = libsigrokhardware.la
libsigrokhardware_la_SOURCES = libsigrokhardware_la_SOURCES =
libsigrokhardware_la_LIBADD = \ libsigrokhardware_la_LIBADD = \
common/libsigrokhwcommon.la \ common/libsigrokhwcommon.la
demo/libsigrokhwdemo.la
if LA_DEMO
libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la
endif
if LA_ASIX_SIGMA if LA_ASIX_SIGMA
libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la

4
hardware/demo/Makefile.am
View File

@ -17,6 +17,8 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
if LA_DEMO
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwdemo.la noinst_LTLIBRARIES = libsigrokhwdemo.la
@ -26,3 +28,5 @@ libsigrokhwdemo_la_SOURCES = \
libsigrokhwdemo_la_CFLAGS = \ libsigrokhwdemo_la_CFLAGS = \
-I$(top_srcdir)/libsigrok -I$(top_srcdir)/libsigrok
endif

4
hwplugin.c
View File

@ -42,7 +42,9 @@ struct hwcap_option hwcap_options[] = {
{0, 0, NULL, NULL}, {0, 0, NULL, NULL},
}; };
#ifdef HAVE_LA_DEMO
extern struct device_plugin demo_plugin_info; extern struct device_plugin demo_plugin_info;
#endif
#ifdef HAVE_LA_SALEAE_LOGIC #ifdef HAVE_LA_SALEAE_LOGIC
extern struct device_plugin saleae_logic_plugin_info; extern struct device_plugin saleae_logic_plugin_info;
#endif #endif
@ -63,7 +65,9 @@ extern struct device_plugin link_mso19_plugin_info;
/* 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)
{ {
#ifdef HAVE_LA_DEMO
plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info); plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
#endif
#ifdef HAVE_LA_SALEAE_LOGIC #ifdef HAVE_LA_SALEAE_LOGIC
plugins = plugins =
g_slist_append(plugins, (gpointer *)&saleae_logic_plugin_info); g_slist_append(plugins, (gpointer *)&saleae_logic_plugin_info);