* liboil/Makefile.am: Fixups from conflicts in previous commit.

* liboil/conv/Makefile.am:
* liboil/powerpc/recon8x8_altivec.c:
* liboil/powerpc/recon8x8_ppc.c:
* liboil/powerpc_asm_blocks/Makefile.am: Move asm-blocks stuff
to a separate directory, since it requires different CPU flags.
* liboil/powerpc_asm_blocks/recon8x8_altivec.c:
* liboil/powerpc_asm_blocks/recon8x8_ppc.c:

6 files changed, 29 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c6d882..20c805e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2005-10-27  David Schleef  <ds@schleef.org>
 
+	* liboil/Makefile.am: Fixups from conflicts in previous commit.
+	* liboil/conv/Makefile.am:
+	* liboil/powerpc/recon8x8_altivec.c:
+	* liboil/powerpc/recon8x8_ppc.c:
+
+	* liboil/powerpc_asm_blocks/Makefile.am: Move asm-blocks stuff
+	  to a separate directory, since it requires different CPU flags.
+	* liboil/powerpc_asm_blocks/recon8x8_altivec.c:
+	* liboil/powerpc_asm_blocks/recon8x8_ppc.c:
+
+2005-10-27  David Schleef  <ds@schleef.org>
+
 	* autogen.sh: Refactor how we check for intrinsics and flags.
 	  Remove hard-coded CFLAGS that don't work on Forte.  This is
 	  not complete, specifically, some of the makefiles aren't up
diff --git a/liboil/Makefile.am b/liboil/Makefile.am
index 53908af..ae1bf14 100644
--- a/liboil/Makefile.am
+++ b/liboil/Makefile.am
@@ -12,13 +12,17 @@ endif
 if HAVE_GCC_POWERPC
 subdir_powerpc = powerpc motovec
 libs_powerpc = powerpc/libpowerpc.la motovec/libmotovec.la
+if HAVE_ASM_BLOCKS
+subdir_powerpc += powerpc_asm_blocks
+libs_powerpc += powerpc/libpowerpc_asm_blocks.la
+endif
 else
 subdir_powerpc =
 libs_powerpc = 
 endif
 
 
-DIST_SUBDIRS = colorspace conv copy dct fb i386 jpeg math md5 motovec powerpc ref simdpack sse utf8 
+DIST_SUBDIRS = colorspace conv copy dct fb i386 jpeg math md5 motovec powerpc powerpc_asm_blocks ref simdpack sse utf8 
 SUBDIRS = colorspace conv copy dct fb $(subdir_i386) jpeg math md5 $(subdir_powerpc) ref simdpack sse utf8 
 
 lib_LTLIBRARIES = liboiltmp1.la liboil-@LIBOIL_MAJORMINOR@.la
@@ -54,7 +58,7 @@ liboilfunctions_la_LIBADD = \
 	jpeg/libjpeg.la \
 	math/libmath.la \
 	md5/libmd5.la \
-	$(powerpc_libs)
+	$(powerpc_libs) \
 	ref/libref.la \
 	simdpack/libsimdpack.la \
 	sse/libsse.la \
diff --git a/liboil/conv/Makefile.am b/liboil/conv/Makefile.am
index cda9e01..5332c6e 100644
--- a/liboil/conv/Makefile.am
+++ b/liboil/conv/Makefile.am
@@ -30,7 +30,6 @@ noinst_HEADERS = conv.h
 
 libconv_la_SOURCES = \
 	$(c_sources) \
-	$(powerpc_sources) \
 	$(i386_sources) \
 	$(amd64_sources)
 libconv_la_CFLAGS = $(LIBOIL_CFLAGS)
diff --git a/liboil/powerpc_asm_blocks/Makefile.am b/liboil/powerpc_asm_blocks/Makefile.am
new file mode 100644
index 0000000..49daf64
--- /dev/null
+++ b/liboil/powerpc_asm_blocks/Makefile.am
@@ -0,0 +1,11 @@
+
+noinst_LTLIBRARIES = libpowerpc.la
+
+sources = \
+	recon8x8_ppc.c  \
+	recon8x8_altivec.c  
+
+libpowerpc_asm_blocks_la_SOURCES = \
+	$(sources)
+libpowerpc_asm_blocks_la_CFLAGS = $(LIBOIL_CFLAGS)
+
diff --git a/liboil/powerpc/recon8x8_altivec.c b/liboil/powerpc_asm_blocks/recon8x8_altivec.c
index 1d85b2a..1d85b2a 100644
--- a/liboil/powerpc/recon8x8_altivec.c
+++ b/liboil/powerpc_asm_blocks/recon8x8_altivec.c
diff --git a/liboil/powerpc/recon8x8_ppc.c b/liboil/powerpc_asm_blocks/recon8x8_ppc.c
index 0983deb..0983deb 100644
--- a/liboil/powerpc/recon8x8_ppc.c
+++ b/liboil/powerpc_asm_blocks/recon8x8_ppc.c