diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-07-07 00:53:31 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-07-13 12:43:56 +0100 |
| commit | 8676890018a94b475dd0bb7389f3b77f37e36fdb (patch) | |
| tree | 7fca2126f67bd979a1f2c3f92d4d2c26d3f21648 | |
| parent | 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 (diff) | |
Rename sparc/clip.S -> sparc/sparc_clip.S
Automake can't handle having both clip.S and clip.c, even though they have different paths
"src/mesa/Makefile.am: object `clip.lo' created by `$(SRCDIR)/sparc/clip.S' and `$(SRCDIR)/main/clip.c'"
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 2 | ||||
| -rw-r--r-- | src/mesa/sparc/sparc_clip.S (renamed from src/mesa/sparc/clip.S) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 819a0fd7d29..906c57962dd 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -430,7 +430,7 @@ if env['gcc'] and env['platform'] not in ('darwin', 'windows'): elif env['machine'] == 'sparc': mesa_sources += [ 'sparc/sparc.c', - 'sparc/clip.S', + 'sparc/sparc_clip.S', 'sparc/norm.S', 'sparc/xform.S', ] diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 16b1c39c06a..d22f0595c53 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -307,7 +307,7 @@ X86_64_FILES = \ $(SRCDIR)/x86-64/xform4.S SPARC_FILES = \ - $(SRCDIR)/sparc/clip.S \ + $(SRCDIR)/sparc/sparc_clip.S \ $(SRCDIR)/sparc/norm.S \ $(SRCDIR)/sparc/xform.S diff --git a/src/mesa/sparc/clip.S b/src/mesa/sparc/sparc_clip.S index dc239171ff9..dc239171ff9 100644 --- a/src/mesa/sparc/clip.S +++ b/src/mesa/sparc/sparc_clip.S |