new-driver: fix to match new libsigrok driver build method

[sigrok-util.git] / source / new-driver

diff --git a/source/new-driver b/source/new-driver
index 64a20c927bab56ba253f21af42fed023cc7e9872..937a6741292fe6d33793e7817489c6f02dc7d31d 100755 (executable)
--- a/source/new-driver
+++ b/source/new-driver
@@ -29,13 +29,13 @@ import datetime
 
 TMPL_AUTOCONF_DRIVER = "SR_DRIVER([{name}], [{short}])\n"
 
-TMPL_FILES = ('api.c', 'protocol.c', 'protocol.h')
+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 += " \\\nsrc/hardware/{short}/" + tmpl_file
-TMPL_HWMAKE_DRIVERLIB += "\nendif"
+    TMPL_HWMAKE_DRIVERLIB += " \\\n\tsrc/hardware/{short}/" + tmpl_file
+TMPL_HWMAKE_DRIVERLIB += "\nendif\n"
 
 
 def tmpl(template, names):
@@ -59,7 +59,7 @@ def new_driver(srcurl, tmpldir, names):
         do_autoconf(gitdir, names)
         do_automake(gitdir, names)
         do_driverskel(gitdir, tmpldir, names)
-        make_patch(gitdir)
+        make_patch(gitdir, names)
     except Exception as e:
         raise
         print(e)
@@ -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)