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 7f67542..1d868b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,30 +15,8 @@
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 ea03c74..8c23a50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,5 +107,5 @@
# 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
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 701a327..340af00 100644
--- 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 99473b6..c13f89e 100644
--- 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 bc9b027..194b7f9 100644
--- 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 6096eaa..fa54902 100644
--- 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 eef547a..19c1d01 100644
--- 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 7414e41..404ae95 100644
--- 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 da7a3ff..0f412d7 100644
--- 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 5de3637..982a6e0 100644
--- 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 ec2df9a..98e97da 100644
--- 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 33d5063..742c9ce 100644
--- 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 3fd591b..6f74cc6 100644
--- 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 8d82e40..8ebe243 100644
--- 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 c0804ec..8a7c68f 100644
--- 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 f061ee9..e05d540 100644
--- 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 bd967db..7d787f1 100644
--- 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 30d3340..ed7e6a0 100644
--- 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 46556b1..3511457 100644
--- 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 87935a9..e018e6b 100644
--- 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 e42d225..f0ad962 100644
--- 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 6e37497..5338db3 100644
--- 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 6469f3c..9b8d04c 100644
--- 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 0f5cbd8..6c9abca 100644
--- 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 662a522..e5802ac 100644
--- 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 775b1e8..563f41c 100644
--- 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 a5ad52b..4ee34a0 100644
--- 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 6bb429a..fc9e21a 100644
--- 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 aafa810..fda073f 100644
--- 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 4122c64..d568dad 100644
--- 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 b31346a..10046e9 100644
--- 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 6de93ad..db9d1a3 100644
--- 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 7838e27..31f2a6a 100644
--- 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 8bbf64e..d82b970 100644
--- a/simd/jsimdext.inc
+++ b/simd/jsimdext.inc
@@ -272,6 +272,6 @@
; --------------------------------------------------------------------------
; 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