autotools: replace user variables with automake variables

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
thesofproject · Jul 6, 2018 · 17c929e · 17c929e
1 parent fa48c42
commit 17c929e
Show file tree

Hide file tree

Showing 16 changed files with 184 additions and 277 deletions.
diff --git a/configure.ac b/configure.ac
@@ -86,17 +86,13 @@ case "$with_arch" in
     xtensa*)
 
 	ARCH_CFLAGS="-mtext-section-literals"
-	AC_SUBST(ARCH_CFLAGS)
 
 	ARCH_LDFLAGS="-nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static"
-	AC_SUBST(XTENSA_LDFLAGS)
 
-	# extra CFLAGS defined here otherwise configure working gcc tests fails.
-	CFLAGS="${CFLAGS:+$CFLAGS }-fno-inline-functions -nostdlib -mlongcalls"
-	LDFLAGS="${LDFLAGS:+$LDFLAGS }-nostdlib"
-
-	#ARCH_ASFLAGS=""
-	AC_SUBST(ARCH_ASFLAGS)
+	# automake FLAGS defined here
+	AM_CFLAGS="-fno-inline-functions -nostdlib -mlongcalls"
+	AM_LDFLAGS="-nostdlib"
+	AM_CCASFLAGS="-fno-inline-functions -nostdlib -mlongcalls"
 
 	ARCH="xtensa"
 	AC_SUBST(ARCH)
@@ -109,11 +105,11 @@ case "$with_arch" in
     host*)
 
 	ARCH_CFLAGS="-g"
-	AC_SUBST(ARCH_CFLAGS)
 
-	# extra CFLAGS defined here otherwise configure working gcc tests fails.
-	CFLAGS="${CFLAGS:+$CFLAGS } -O3"
-	LDFLAGS="${LDFLAGS:+$LDFLAGS }-lpthread"
+	# automake FLAGS defined here
+	AM_CFLAGS="-O3"
+	AM_LDFLAGS="-lpthread"
+	AM_CCASFLAGS="-O3"
 
 	ARCH="host"
 	AC_SUBST(ARCH)
@@ -125,6 +121,13 @@ case "$with_arch" in
     ;;
 esac
 
+AC_SUBST(ARCH_CFLAGS)
+AC_SUBST(ARCH_LDFLAGS)
+
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
+AC_SUBST(AM_CCASFLAGS)
+
 AM_CONDITIONAL(BUILD_XTENSA, test "$ARCH" = "xtensa")
 AM_CONDITIONAL(BUILD_HOST, test "$ARCH" = "host")
 
@@ -494,5 +497,8 @@ CFLAGS:                        ${CFLAGS}
 LDFLAGS:                       ${LDFLAGS}
 ARCH_CFLAGS:                   ${ARCH_CFLAGS}
 ARCH_LDFLAGS:                  ${ARCH_LDFLAGS}
+A@&t@M_CFLAGS:                     ${AM_CFLAGS}
+A@&t@M_LDFLAGS:                    ${AM_LDFLAGS}
+A@&t@M_CCASFLAGS:                  ${AM_CCASFLAGS}
 "
 
diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am
@@ -31,7 +31,7 @@ libreset_a_SOURCES = \
 libreset_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
 	$(ASFLAGS) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	-mtext-section-literals
 
@@ -49,14 +49,15 @@ endif
 
 sof_CFLAGS = \
 	$(ARCH_INCDIR) \
+	$(AM_CFLAGS) \
 	$(ARCH_CFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(SOF_INCDIR)
 
 sof_CCASFLAGS = \
 	$(ARCH_INCDIR) \
 	$(ASFLAGS) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR)
 
 sof_LDADD = \
@@ -83,6 +84,7 @@ sof_LDADD += \
 endif
 
 sof_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	$(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \
 	-T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT)
 
@@ -110,14 +112,15 @@ boot_ldr_SOURCES = \
 
 boot_ldr_CFLAGS = \
 	$(ARCH_INCDIR) \
+	$(AM_CFLAGS) \
 	$(ARCH_CFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(SOF_INCDIR)
 
 boot_ldr_CCASFLAGS = \
 	$(ARCH_INCDIR) \
 	$(ASFLAGS) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR)
 
 boot_ldr_LDADD = \
@@ -126,6 +129,7 @@ boot_ldr_LDADD = \
 	-lgcc
 
 boot_ldr_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	$(ARCH_LDFLAGS) \
 	-T ../../platform/$(PLATFORM)/$(PLATFORM_BOOT_LDR_LDSCRIPT)
 

diff --git a/src/arch/xtensa/hal/Makefile.am b/src/arch/xtensa/hal/Makefile.am
@@ -223,12 +223,13 @@ libhal_a_SOURCES = \
 
 libhal_a_CFLAGS = \
 	$(ARCH_INCDIR) \
+	$(AM_CFLAGS) \
 	$(ARCH_CFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS)
 
 libhal_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS)
diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am
@@ -62,7 +62,7 @@ libxlevel2_a_SOURCES = \
 
 libxlevel2_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS) \
 	-D_INTERRUPT_LEVEL=2
@@ -72,7 +72,7 @@ libxlevel3_a_SOURCES = \
 
 libxlevel3_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS) \
 	-D_INTERRUPT_LEVEL=3
@@ -82,7 +82,7 @@ libxlevel4_a_SOURCES = \
 
 libxlevel4_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS) \
 	-D_INTERRUPT_LEVEL=4
@@ -92,7 +92,7 @@ libxlevel5_a_SOURCES = \
 
 libxlevel5_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS) \
 	-D_INTERRUPT_LEVEL=5
@@ -103,7 +103,7 @@ libxlevel6_a_SOURCES = \
 
 libxlevel6_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS) \
 	-D_INTERRUPT_LEVEL=6
@@ -142,12 +142,13 @@ libxtos_a_SOURCES = \
 
 libxtos_a_CFLAGS = \
 	$(ARCH_INCDIR) \
+	$(AM_CFLAGS) \
 	$(ARCH_CFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS)
 
 libxtos_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
-	$(ARCH_ASFLAGS) \
+	$(AM_CCASFLAGS) \
 	$(PLATFORM_INCDIR) \
 	$(PLATFORM_DEFS)