Bug 646485 - Fix include path in jpeg/Makefile.in. r=khuey
authorJustin Lebar <justin.lebar@gmail.com>
Wed, 30 Mar 2011 13:04:43 -0400
changeset 67787 2a2330ab6a2998746b465aba7cdafbd21ba4cda1
parent 67747 00b34481041ac7ba6fb5b75dee561e2306e159f8
child 67788 028a07f2fae2d706e00e1d0e2db5e60f5e37d958
push id19428
push usereakhgari@mozilla.com
push dateSun, 10 Apr 2011 19:11:44 +0000
treeherdermozilla-central@6eaee284fdb9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs646485
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 646485 - Fix include path in jpeg/Makefile.in. r=khuey
jpeg/Makefile.in
--- a/jpeg/Makefile.in
+++ b/jpeg/Makefile.in
@@ -108,17 +108,17 @@ CSRCS		+= \
 		jcparam.c \
 		jcphuff.c \
 		jcprepct.c \
 		jcsample.c \
 		$(NULL)
 
 AS=$(LIBJPEG_TURBO_AS)
 ASM_SUFFIX=asm
-ASFLAGS=$(LIBJPEG_TURBO_ASFLAGS) -I$(topsrcdir)/modules/libjpeg-turbo/simd/
+ASFLAGS=$(LIBJPEG_TURBO_ASFLAGS) -I$(topsrcdir)/jpeg/simd/
 
 ifeq ($(AS),yasm)
   # yasm doesn't like -c
   AS_DASH_C_FLAG=
 endif
 
 # No SIMD support?
 ifeq (,$(LIBJPEG_TURBO_X86_ASM)$(LIBJPEG_TURBO_X64_ASM))
@@ -177,17 +177,16 @@ ifeq (1,$(LIBJPEG_TURBO_X86_ASM))
 	simd/jiss2fst.asm \
 	simd/jiss2int.asm \
 	simd/jiss2red.asm \
 	simd/jisseflt.asm \
 	simd/jsimdcpu.asm \
 	$(NULL)
 endif
 
-# jwinfig.h, jos2fig.h  ? XXX
 EXPORTS		= \
 		jconfig.h \
 		jerror.h \
 		jinclude.h \
 		jmorecfg.h \
 		jpegint.h \
 		jpeglib.h \
 		$(NULL)