From 5b447f4c7a92f94e579d1f7b32acafcc04ebd56c Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 23 Jun 2016 22:28:07 +0200 Subject: [PATCH] new-driver: fix to match new libsigrok driver build method --- source/new-driver | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/new-driver b/source/new-driver index e14b820..937a674 100755 --- a/source/new-driver +++ b/source/new-driver @@ -32,7 +32,7 @@ TMPL_AUTOCONF_DRIVER = "SR_DRIVER([{name}], [{short}])\n" TMPL_FILES = ('protocol.h', 'protocol.c', 'api.c') TMPL_HWMAKE_DRIVERLIB = """if HW_{upper} -libsigrok_la_SOURCES +=""" +src_libdrivers_la_SOURCES +=""" for tmpl_file in TMPL_FILES: TMPL_HWMAKE_DRIVERLIB += " \\\n\tsrc/hardware/{short}/" + tmpl_file TMPL_HWMAKE_DRIVERLIB += "\nendif\n" @@ -108,7 +108,7 @@ def do_automake(gitdir, names): if drv_short > names['upper']: out += tmpl(TMPL_HWMAKE_DRIVERLIB, names) state = 'done' - elif not re.match(r'\s*libsigrok_la_SOURCES\b|\s*src/hardware/|endif\b', line): + elif not re.match(r'\s*src_libdrivers_la_SOURCES\b|\s*src/hardware/|endif\b', line): print("[%s]" % line.strip()) # we passed the last entry out += tmpl(TMPL_HWMAKE_DRIVERLIB, names) -- 2.30.2