diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2010-03-15 10:52:17 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2010-03-15 10:52:20 -0700 |
| commit | b67f784a5dc51f41e40bb1a165411f5259ea0ee4 (patch) | |
| tree | 5eef61b6ba26d969505a97c1965e82afa28ae8da | |
| parent | 7a5dc747852d46fa382ef885bb6299723ef6ed00 (diff) | |
Make .s target asm flag selection more portable
The previous code worked in GNU make, but caused a syntax error in Solaris
make ( https://bugs.freedesktop.org/show_bug.cgi?id=27062 ) - this seems to
work in both, and should hopefully not cause syntax errors in any versions
of make not supporting the macro-substitution-in-macro-name feature, just
cause the macro to expand to nothing.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | pixman/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pixman/Makefile.am b/pixman/Makefile.am index cd01023..8ac6827 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am @@ -64,7 +64,7 @@ libpixman_mmx_la_LIBADD = $(DEP_LIBS) libpixman_1_la_LDFLAGS += $(MMX_LDFLAGS) libpixman_1_la_LIBADD += libpixman-mmx.la -$(libpixman_mmx_la_SOURCES:.c=.s) : ASM_CFLAGS=$(MMX_CFLAGS) +ASM_CFLAGS_mmx=$(MMX_CFLAGS) endif # vmx code @@ -77,7 +77,7 @@ libpixman_vmx_la_CFLAGS = $(DEP_CFLAGS) $(VMX_CFLAGS) libpixman_vmx_la_LIBADD = $(DEP_LIBS) libpixman_1_la_LIBADD += libpixman-vmx.la -$(libpixman_vmx_la_SOURCES:.c=.s) : ASM_CFLAGS=$(VMX_CFLAGS) +ASM_CFLAGS_vmx=$(VMX_CFLAGS) endif # sse2 code @@ -90,7 +90,7 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS) libpixman_1_la_LDFLAGS += $(SSE2_LDFLAGS) libpixman_1_la_LIBADD += libpixman-sse2.la -$(libpixman_sse2_la_SOURCES:.c=.s) : ASM_CFLAGS=$(SSE2_CFLAGS) +ASM_CFLAGS_sse2=$(SSE2_CFLAGS) endif # arm simd code @@ -102,7 +102,7 @@ libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS) libpixman_arm_simd_la_LIBADD = $(DEP_LIBS) libpixman_1_la_LIBADD += libpixman-arm-simd.la -$(libpixman_arm_simd_la_SOURCES:.c=.s) : ASM_CFLAGS=$(ARM_SIMD_CFLAGS) +ASM_CFLAGS_arm_simd=$(ARM_SIMD_CFLAGS) endif # arm neon code @@ -116,8 +116,8 @@ libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS) libpixman_arm_neon_la_LIBADD = $(DEP_LIBS) libpixman_1_la_LIBADD += libpixman-arm-neon.la -$(libpixman_arm_neon_la_SOURCES:.c=.s) : ASM_CFLAGS= +ASM_CFLAGS_arm_neon= endif .c.s : $(libpixmaninclude_HEADERS) $(BUILT_SOURCES) - $(CC) $(CFLAGS) $(ASM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) -S -o $@ $< + $(CC) $(CFLAGS) $(ASM_CFLAGS_$(@:pixman-%.s=%)) $(ASM_CFLAGS_$(@:pixman-arm-%.s=arm_%)) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) -S -o $@ $< |