From 28bfd1b3e506310958a1855f84a4574cad4ed46d Mon Sep 17 00:00:00 2001
From: Rohit Goswami <rog32@hi.is>
Date: Sat, 13 Apr 2024 13:37:05 +0000
Subject: [PATCH] MAINT: Simplify and generalize

---
 kernel/meson.build | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/kernel/meson.build b/kernel/meson.build
index 00ce716bf..d6c418b7c 100644
--- a/kernel/meson.build
+++ b/kernel/meson.build
@@ -783,22 +783,13 @@ _configs = [
   #  'def': [],
   #  'addl': [fma3_flag]},
   {'name': 'drot_k',
-   'undef': ['COMPLEX', 'COMPLEX'],
+   'undef': ['COMPLEX'],
    'def': ['DOUBLE'],
-   'addl': [fma3_flag,
-        '-DASMNAME=drot_k',
-        '-DASMFNAME=drot_k_',
-        '-DNAME=drot_k_',
-        '-DCNAME=drot_k',
-        '-DCHAR_NAME="drot_k_"',
-        '-DCHAR_CNAME="drot_k"',
-        '-DDOUBLE',
-        '-UCOMPLEX',
-           ]},
-  # {'name': 'qrot_k',
-  #  'undef': ['COMPLEX', 'COMPLEX'],
-  #  'def': ['XDOUBLE'],
-  #  'addl': []},
+   'addl': [fma3_flag]},
+  {'name': 'qrot_k',
+   'undef': ['COMPLEX'],
+   'def': ['XDOUBLE'],
+   'addl': []},
   # {'name': 'csrot_k',
   #  'undef': ['DOUBLE'],
   #  'def': ['COMPLEX', 'COMPLEX'],
@@ -839,8 +830,22 @@ foreach _kop : base_kops
           foreach _addl : addl
             _cargs += addl
           endforeach
-          current_def = {'c_args': _cargs, 'name': cfg['name'], 'src': src}
-          message(current_def)
+          sym_name = cfg['name']
+          sym_underscored = f'@sym_name@_'
+          current_def = {
+            'c_args': [
+              _cargs,
+              f'-DASMNAME=@sym_name@',
+              f'-DASMFNAME=@sym_underscored@',
+              f'-DNAME=@sym_underscored@',
+              f'-DCNAME=@sym_name@',
+              f'-DCHAR_NAME="@sym_underscored@"',
+              f'-DCHAR_CNAME="@sym_name@"',
+            ],
+            'name': cfg['name'],
+            'src': src
+          }
+          # message(current_def)
           kernel_confs += current_def
         endif
       endforeach