Use perl regexp.

[bertos.git] / wizard / mktemplates / template_wiz.mk

diff --git a/wizard/mktemplates/template_wiz.mk b/wizard/mktemplates/template_wiz.mk
index eeca4c9fbd813419decf0abe8374ad701a27d151..3b97acae55ed1c96dcb8f0b151b20e91c5e0b4a7 100644 (file)
--- a/wizard/mktemplates/template_wiz.mk
+++ b/wizard/mktemplates/template_wiz.mk
@@ -18,8 +18,6 @@ $pname_PREFIX = "$prefix"
 
 $pname_SUFFIX = "$suffix"
 
-$pname_$cpuflag = $cpuname
-
 # Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CSRC INSTEAD!
 $pname_WIZARD_CSRC = \
        $csrc
@@ -45,10 +43,19 @@ $pname_WIZARD_ASRC = \
        $asrc
        #
 
-$pname_CFLAGS = $cflags
-$pname_LDFLAGS = $ldflags
-$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $cppflags
-$pname_CPPAFLAGS = $cppaflags
-$pname_CXXFLAGS = $cxxflags
-$pname_ASFLAGS = $asflags
-$pname_ARFLAGS = $arflags
+$pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $($pname_CPU_CPPFLAGS)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CSRC = $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_PCSRC = $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CXXSRC = $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC)