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.
2009-03-16 13:34:18 +00:00
parent 98d1d692b5
commit a63544a357
36 changed files with 88 additions and 83 deletions
--- 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
+SUBDIRS = simd
-
+libjpeg_la_LIBADD = simd/libsimd.la
 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
 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_%%' > $@
--- 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
--- a/simd/Makefile.am
+++ 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_%%' > $@
--- a/simd/jccolmmx.asm
+++ b/simd/jccolmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jcolsamp.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jccolss2.asm
+++ b/simd/jccolss2.asm
@@ -13,8 +13,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jcolsamp.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jcqnt3dn.asm
+++ b/simd/jcqnt3dn.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jcqntmmx.asm
+++ b/simd/jcqntmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jcqnts2f.asm
+++ b/simd/jcqnts2f.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jcqnts2i.asm
+++ b/simd/jcqnts2i.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jcqntsse.asm
+++ b/simd/jcqntsse.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jcsammmx.asm
+++ b/simd/jcsammmx.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jcsamss2.asm
+++ b/simd/jcsamss2.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- a/simd/jdcolmmx.asm
+++ b/simd/jdcolmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jcolsamp.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jdcolss2.asm
+++ b/simd/jdcolss2.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jcolsamp.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jdmermmx.asm
+++ b/simd/jdmermmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jcolsamp.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jdmerss2.asm
+++ b/simd/jdmerss2.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jcolsamp.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jdsammmx.asm
+++ b/simd/jdsammmx.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
--- a/simd/jdsamss2.asm
+++ b/simd/jdsamss2.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
--- a/simd/jf3dnflt.asm
+++ b/simd/jf3dnflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
--- a/simd/jfmmxfst.asm
+++ b/simd/jfmmxfst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jfmmxint.asm
+++ b/simd/jfmmxint.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jfss2fst.asm
+++ b/simd/jfss2fst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jfss2int.asm
+++ b/simd/jfss2int.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jfsseflt.asm
+++ b/simd/jfsseflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/ji3dnflt.asm
+++ b/simd/ji3dnflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
--- a/simd/jimmxfst.asm
+++ b/simd/jimmxfst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jimmxint.asm
+++ b/simd/jimmxint.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jimmxred.asm
+++ b/simd/jimmxred.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jiss2flt.asm
+++ b/simd/jiss2flt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jiss2fst.asm
+++ b/simd/jiss2fst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jiss2int.asm
+++ b/simd/jiss2int.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jiss2red.asm
+++ b/simd/jiss2red.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jisseflt.asm
+++ b/simd/jisseflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jdct.inc"
 ; --------------------------------------------------------------------------
--- a/simd/jsimdcpu.asm
+++ b/simd/jsimdcpu.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
--- 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"
 ; --------------------------------------------------------------------------
--- a/simd/nasm_lt.sh
+++ b/simd/nasm_lt.sh