Work around subdirectory bug in older automake.

Older versions of automake doesn't properly support no-recursive make.
Reimplement the build system by having a local Makefile.am in the
simd/ directory.

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@31 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/Makefile.am b/Makefile.am
index 7f67542ec2072c13031855cdc435dca5f929868e..1d868b7b3ce1e13402ff26c4dc29737df63d76f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,30 +15,8 @@ libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \
 
 if WITH_SIMD
 
-BUILT_SOURCES = simd/jsimdcfg.inc
-
-EXTRA_DIST = nasm_lt.sh
-
-libjpeg_la_SOURCES += simd/jsimd.h simd/jsimdcfg.inc.h \
-       simd/jsimdext.inc simd/jcolsamp.inc simd/jdct.inc \
-       simd/jsimdcpu.asm \
-       simd/jccolmmx.asm simd/jdcolmmx.asm \
-       simd/jcsammmx.asm simd/jdsammmx.asm simd/jdmermmx.asm \
-       simd/jcqntmmx.asm simd/jfmmxfst.asm simd/jfmmxint.asm \
-       simd/jimmxred.asm simd/jimmxint.asm simd/jimmxfst.asm \
-       simd/jcqnt3dn.asm simd/jf3dnflt.asm simd/ji3dnflt.asm \
-       simd/jcqntsse.asm simd/jfsseflt.asm simd/jisseflt.asm \
-       simd/jccolss2.asm simd/jdcolss2.asm \
-       simd/jcsamss2.asm simd/jdsamss2.asm simd/jdmerss2.asm \
-       simd/jcqnts2i.asm simd/jfss2fst.asm simd/jfss2int.asm \
-       simd/jiss2red.asm simd/jiss2int.asm simd/jiss2fst.asm \
-       simd/jcqnts2f.asm simd/jiss2flt.asm
+SUBDIRS = simd
+libjpeg_la_LIBADD = simd/libsimd.la
 
 endif
 
-.asm.lo:
-       $(LIBTOOL) --mode=compile --tag NASM ./nasm_lt.sh $(NASM) $(NAFLAGS) $< -o $@
-
-simd/jsimdcfg.inc: simd/jsimdcfg.inc.h jpeglib.h jconfig.h jmorecfg.h
-       $(CPP) $< | grep ^[\;%] | sed 's%_cpp_protection_%%' > $@
-

diff --git a/configure.ac b/configure.ac
index ea03c7400599a8bab8cecab88132c53c60a2fb0f..8c23a50152919324a88809ef7ff31343a5f13a65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -107,5 +107,5 @@ AM_CONDITIONAL([WITH_SIMD], [test "x$with_simd" != "xno"])
 # jconfig.h is a minimal version that allows this package to be built
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([jconfig.h])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile simd/Makefile])
 AC_OUTPUT

diff --git a/simd/Makefile.am b/simd/Makefile.am
new file mode 100644 (file)
index 0000000..ea53fee
--- /dev/null
+++ b/simd/Makefile.am
@@ -0,0 +1,27 @@
+noinst_LTLIBRARIES = libsimd.la
+
+BUILT_SOURCES = jsimdcfg.inc
+
+EXTRA_DIST = nasm_lt.sh
+
+libsimd_la_SOURCES = jsimd.h jsimdcfg.inc.h \
+       jsimdext.inc jcolsamp.inc jdct.inc \
+       jsimdcpu.asm \
+       jccolmmx.asm jdcolmmx.asm \
+       jcsammmx.asm jdsammmx.asm jdmermmx.asm \
+       jcqntmmx.asm jfmmxfst.asm jfmmxint.asm \
+       jimmxred.asm jimmxint.asm jimmxfst.asm \
+       jcqnt3dn.asm jf3dnflt.asm ji3dnflt.asm \
+       jcqntsse.asm jfsseflt.asm jisseflt.asm \
+       jccolss2.asm jdcolss2.asm \
+       jcsamss2.asm jdsamss2.asm jdmerss2.asm \
+       jcqnts2i.asm jfss2fst.asm jfss2int.asm \
+       jiss2red.asm jiss2int.asm jiss2fst.asm \
+       jcqnts2f.asm jiss2flt.asm
+
+.asm.lo:
+       $(LIBTOOL) --mode=compile --tag NASM ./nasm_lt.sh $(NASM) $(NAFLAGS) $< -o $@
+
+jsimdcfg.inc: jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h
+       $(CPP) $< | grep ^[\;%] | sed 's%_cpp_protection_%%' > $@
+

diff --git a/simd/jccolmmx.asm b/simd/jccolmmx.asm
index 701a3271fe74124ae5b6956646658fd6a2bba39f..340af00a297319d7c75df527bef4437894cef7b4 100644 (file)
--- a/simd/jccolmmx.asm
+++ b/simd/jccolmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jccolss2.asm b/simd/jccolss2.asm
index 99473b650d2f2943e41fd531cc1b2cd731c5d871..c13f89e2c4baef53179f8624f1d08158651c062b 100644 (file)
--- a/simd/jccolss2.asm
+++ b/simd/jccolss2.asm
@@ -13,8 +13,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jcqnt3dn.asm b/simd/jcqnt3dn.asm
index bc9b02732a3e9e8709e049ad2f9e30e8195b556a..194b7f9bb1e66e5ed5038a4fe53bbea451e04668 100644 (file)
--- a/simd/jcqnt3dn.asm
+++ b/simd/jcqnt3dn.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jcqntmmx.asm b/simd/jcqntmmx.asm
index 6096eaa99c75426f2f3a53c9ead518316d0d4dca..fa54902ad8d79bae1e5eed8786d767a3b58b5633 100644 (file)
--- a/simd/jcqntmmx.asm
+++ b/simd/jcqntmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jcqnts2f.asm b/simd/jcqnts2f.asm
index eef547a602716129c0921dfcfe2410246f6c397b..19c1d0173f90b77e7d58d835d355733f1ccaee88 100644 (file)
--- a/simd/jcqnts2f.asm
+++ b/simd/jcqnts2f.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jcqnts2i.asm b/simd/jcqnts2i.asm
index 7414e41ac62e34e7cb7f70d909392a7d91348f04..404ae9576bcd61ef7aa1b4eb0225410aebd96264 100644 (file)
--- a/simd/jcqnts2i.asm
+++ b/simd/jcqnts2i.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jcqntsse.asm b/simd/jcqntsse.asm
index da7a3ff638861b90edd8e7a30eed9810ab96d93f..0f412d7e42daf1ab84717799a17bd6d4a8387acd 100644 (file)
--- a/simd/jcqntsse.asm
+++ b/simd/jcqntsse.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jcsammmx.asm b/simd/jcsammmx.asm
index 5de363729be1025a7d482648158a8b4423eb2572..982a6e0d97379bd5847fd250506478a072e5f112 100644 (file)
--- a/simd/jcsammmx.asm
+++ b/simd/jcsammmx.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jcsamss2.asm b/simd/jcsamss2.asm
index ec2df9aef04d1f1e07da12fb103973398ee9c6b5..98e97da4d5f7307822fbb49a358ebed06002d5c1 100644 (file)
--- a/simd/jcsamss2.asm
+++ b/simd/jcsamss2.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jdcolmmx.asm b/simd/jdcolmmx.asm
index 33d50634f745c24080a935865022ee30b3565c27..742c9cebe9efc1d90439207000977cd77ee157aa 100644 (file)
--- a/simd/jdcolmmx.asm
+++ b/simd/jdcolmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jdcolss2.asm b/simd/jdcolss2.asm
index 3fd591b585a6a0770a906904bb83f39573b18806..6f74cc634af1319d303ff8c56b0bf427f4c2c650 100644 (file)
--- a/simd/jdcolss2.asm
+++ b/simd/jdcolss2.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jdmermmx.asm b/simd/jdmermmx.asm
index 8d82e40a06a3ba11349d67de2fd8e95372577d1d..8ebe243dd2068f81ecbc332c5fa0b4fc6ffb110e 100644 (file)
--- a/simd/jdmermmx.asm
+++ b/simd/jdmermmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jdmerss2.asm b/simd/jdmerss2.asm
index c0804ecdfbb874adb85d502aa8cbdb910851fc13..8a7c68f02b35b0547daa533057e3fefc7f69fa23 100644 (file)
--- a/simd/jdmerss2.asm
+++ b/simd/jdmerss2.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jdsammmx.asm b/simd/jdsammmx.asm
index f061ee93d774908366854807e154989eb50af03b..e05d540e4a757bbf0e495dca12e2228cbfdacf69 100644 (file)
--- a/simd/jdsammmx.asm
+++ b/simd/jdsammmx.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_CONST

diff --git a/simd/jdsamss2.asm b/simd/jdsamss2.asm
index bd967dba5b7b8cddeb82166403923b8f3e263307..7d787f1ce91b2ff7ad272f9c9cf0f3187f10879e 100644 (file)
--- a/simd/jdsamss2.asm
+++ b/simd/jdsamss2.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_CONST

diff --git a/simd/jf3dnflt.asm b/simd/jf3dnflt.asm
index 30d33403000c29d5edc8c72ee44c5dfb10901471..ed7e6a0b708175efa5d25b50502f5c7725f16703 100644 (file)
--- a/simd/jf3dnflt.asm
+++ b/simd/jf3dnflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_CONST

diff --git a/simd/jfmmxfst.asm b/simd/jfmmxfst.asm
index 46556b136f420723ad0dbc4a7d5fdd9139f5dd1f..3511457d97a6837c7d2dd9a5e32113b34824e977 100644 (file)
--- a/simd/jfmmxfst.asm
+++ b/simd/jfmmxfst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jfmmxint.asm b/simd/jfmmxint.asm
index 87935a97e261ced9b16d0e81d3b948b84e4934c0..e018e6bf7d8ae7e202477ef2430da4166a1014b3 100644 (file)
--- a/simd/jfmmxint.asm
+++ b/simd/jfmmxint.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jfss2fst.asm b/simd/jfss2fst.asm
index e42d2251eb4c5cd4b0361719856d40d695e4d2db..f0ad96218b723505c2701c259786c1c0ffb41569 100644 (file)
--- a/simd/jfss2fst.asm
+++ b/simd/jfss2fst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jfss2int.asm b/simd/jfss2int.asm
index 6e37497c292d4b41adf00ed51bc16ecdae7f5d9a..5338db328c5b1e6b695813c16ef9d8d688bb7a40 100644 (file)
--- a/simd/jfss2int.asm
+++ b/simd/jfss2int.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jfsseflt.asm b/simd/jfsseflt.asm
index 6469f3c4644d14b045fb06b68269ba87309680a5..9b8d04ce26b56565f4948ff74a971ac9a234e70b 100644 (file)
--- a/simd/jfsseflt.asm
+++ b/simd/jfsseflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/ji3dnflt.asm b/simd/ji3dnflt.asm
index 0f5cbd81195dc69e9a724b22ff306189719e12dc..6c9abca744bca0128da19f6e7ee29318c035e675 100644 (file)
--- a/simd/ji3dnflt.asm
+++ b/simd/ji3dnflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_CONST

diff --git a/simd/jimmxfst.asm b/simd/jimmxfst.asm
index 662a522fee2892e922f6ca402f2e5e595a2bc226..e5802aceea771cde7bd4819c5e9694fb12acc834 100644 (file)
--- a/simd/jimmxfst.asm
+++ b/simd/jimmxfst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jimmxint.asm b/simd/jimmxint.asm
index 775b1e8c4b4d82d3d2c9cee10dc54f949c92db91..563f41c56594fdaf7a357710f89e80f56804e911 100644 (file)
--- a/simd/jimmxint.asm
+++ b/simd/jimmxint.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jimmxred.asm b/simd/jimmxred.asm
index a5ad52bca3dbe1b1f15dd707066ffa564b9c15e0..4ee34a0a0c250df20a92e8259e6aede7faece79e 100644 (file)
--- a/simd/jimmxred.asm
+++ b/simd/jimmxred.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jiss2flt.asm b/simd/jiss2flt.asm
index 6bb429a277426fdb13a6536b5779608806b2024b..fc9e21a29db094d3403fd42adb7d6e852ddaf619 100644 (file)
--- a/simd/jiss2flt.asm
+++ b/simd/jiss2flt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jiss2fst.asm b/simd/jiss2fst.asm
index aafa81010ef2a3c5d3cbf02d47c629daa2fbafaf..fda073f5d6597cd68156e289b868b919dd35adc7 100644 (file)
--- a/simd/jiss2fst.asm
+++ b/simd/jiss2fst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jiss2int.asm b/simd/jiss2int.asm
index 4122c64019ea31056cefe653b1d293c9e9ed9add..d568dada3138be6e9f4e977d37cb2e7bc0ee1cd7 100644 (file)
--- a/simd/jiss2int.asm
+++ b/simd/jiss2int.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jiss2red.asm b/simd/jiss2red.asm
index b31346a8488bb90553e52d07f35a2baed18ce2c5..10046e9a633a3e25b41bfa5d00b38910b53b814f 100644 (file)
--- a/simd/jiss2red.asm
+++ b/simd/jiss2red.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jisseflt.asm b/simd/jisseflt.asm
index 6de93ada58d1a627ff086370d400aaa0f45a221b..db9d1a39fdc0fd0ccc8bffc9f482023fb5efbf02 100644 (file)
--- a/simd/jisseflt.asm
+++ b/simd/jisseflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 

diff --git a/simd/jsimdcpu.asm b/simd/jsimdcpu.asm
index 7838e27afbadea32c24ecb25e37fafab060f3f14..31f2a6ac29f8a664a52375580c519c544ffe7c24 100644 (file)
--- a/simd/jsimdcpu.asm
+++ b/simd/jsimdcpu.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
        SECTION SEG_TEXT

diff --git a/simd/jsimdext.inc b/simd/jsimdext.inc
index 8bbf64eb894f37532b1d5e87be0a9b6d85a96283..d82b970e0d5581eb4e9fd11851944a73a3a0b523 100644 (file)
--- a/simd/jsimdext.inc
+++ b/simd/jsimdext.inc
@@ -272,6 +272,6 @@ const_base:
 ; --------------------------------------------------------------------------
 ;  Defines picked up from the C headers
 ;
-%include "simd/jsimdcfg.inc"
+%include "jsimdcfg.inc"
 
 ; --------------------------------------------------------------------------

diff --git a/nasm_lt.sh b/simd/nasm_lt.sh
similarity index 100%
rename from nasm_lt.sh
rename to simd/nasm_lt.sh