Index: acinclude.m4
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/acinclude.m4,v
retrieving revision 1.12
diff -u -r1.12 acinclude.m4
--- acinclude.m4	17 Aug 2005 15:34:26 -0000	1.12
+++ acinclude.m4	23 Aug 2005 05:24:08 -0000
@@ -427,7 +427,7 @@
 		])
 		], [
 		AC_MSG_RESULT([yes])
-		am_posix_sem_ok = yes], [
+		am_posix_sem_ok=yes], [
 		AC_MSG_RESULT([no (pshared not usable)])], [
 		AC_MSG_RESULT([no (cannot check usability when cross compiling)])])
 	])
Index: IlmThread/IlmThreadSemaphore.cpp
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/IlmThread/IlmThreadSemaphore.cpp,v
retrieving revision 1.1
diff -u -r1.1 IlmThreadSemaphore.cpp
--- IlmThread/IlmThreadSemaphore.cpp	11 Aug 2005 00:31:58 -0000	1.1
+++ IlmThread/IlmThreadSemaphore.cpp	23 Aug 2005 05:24:08 -0000
@@ -32,7 +32,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#if !defined (_WIN32) && !(HAVE_PTHREAD)
+#if !defined (_WIN32) // && !(HAVE_PTHREAD)
 #include <IlmThreadSemaphore.h>
 
 namespace IlmThread
Index: exrdisplay/Makefile.am
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/exrdisplay/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- exrdisplay/Makefile.am	11 Aug 2005 00:31:58 -0000	1.8
+++ exrdisplay/Makefile.am	23 Aug 2005 05:24:08 -0000
@@ -9,10 +9,12 @@
            -I$(top_srcdir)/IlmImf
 
 LDADD = @CG_LDFLAGS@ @FLTK_LDFLAGS@ \
-	-L$(top_builddir)/Iex -L$(top_builddir)/Half \
-	-L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \
-	-L$(top_builddir)/IlmImf \
-	-lIlmImf -lIlmThread -lImath -lHalf -lIex -lz
+	$(top_builddir)/Iex/libIex.la \
+	$(top_builddir)/Half/libHalf.la \
+	$(top_builddir)/Imath/libImath.la \
+	$(top_builddir)/IlmImf/libIlmImf.la \
+	$(top_builddir)/IlmThread/libIlmThread.la \
+	-lz
 
 install-exec-hook:
 	@FLTK_CONFIG@ --post $(DESTDIR)$(bindir)/exrdisplay
Index: exrenvmap/Makefile.am
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/exrenvmap/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exrenvmap/Makefile.am	11 Aug 2005 00:31:58 -0000	1.3
+++ exrenvmap/Makefile.am	23 Aug 2005 05:24:08 -0000
@@ -6,10 +6,13 @@
            -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
            -I$(top_srcdir)/IlmImf
 
-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \
-	-L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \
-	-L$(top_builddir)/IlmImf \
-	-lIlmImf -lIlmThread -lImath -lHalf -lIex -lz
+LDADD = \
+	$(top_builddir)/Imath/libImath.la \
+	$(top_builddir)/IlmImf/libIlmImf.la \
+	$(top_builddir)/Iex/libIex.la \
+	$(top_builddir)/Half/libHalf.la \
+	$(top_builddir)/IlmThread/libIlmThread.la \
+	-lz
 
 exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \
 		    makeCubeMap.cpp makeCubeMap.h \
Index: exrheader/Makefile.am
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/exrheader/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- exrheader/Makefile.am	11 Aug 2005 00:31:58 -0000	1.2
+++ exrheader/Makefile.am	23 Aug 2005 05:24:08 -0000
@@ -6,10 +6,13 @@
            -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
            -I$(top_srcdir)/IlmImf
 
-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \
-	-L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \
-	-L$(top_builddir)/IlmImf \
-	-lIlmImf -lIlmThread -lImath -lHalf -lIex -lz
+LDADD = \
+	$(top_builddir)/Imath/libImath.la \
+	$(top_builddir)/IlmImf/libIlmImf.la \
+	$(top_builddir)/Iex/libIex.la \
+	$(top_builddir)/Half/libHalf.la \
+	$(top_builddir)/IlmThread/libIlmThread.la \
+	-lz
 
 exrheader_SOURCES = main.cpp
 
Index: exrmakepreview/Makefile.am
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/exrmakepreview/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exrmakepreview/Makefile.am	11 Aug 2005 00:31:58 -0000	1.3
+++ exrmakepreview/Makefile.am	23 Aug 2005 05:24:08 -0000
@@ -6,10 +6,13 @@
            -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
            -I$(top_srcdir)/IlmImf
 
-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \
-	-L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \
-	-L$(top_builddir)/IlmImf \
-	-lIlmImf -lIlmThread -lImath -lHalf -lIex -lz
+LDADD = \
+	$(top_builddir)/Imath/libImath.la \
+	$(top_builddir)/IlmImf/libIlmImf.la \
+	$(top_builddir)/Iex/libIex.la \
+	$(top_builddir)/Half/libHalf.la \
+	$(top_builddir)/IlmThread/libIlmThread.la \
+	-lz
 
 exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h
 
Index: exrmaketiled/Makefile.am
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/exrmaketiled/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- exrmaketiled/Makefile.am	11 Aug 2005 00:31:58 -0000	1.2
+++ exrmaketiled/Makefile.am	23 Aug 2005 05:24:08 -0000
@@ -6,10 +6,13 @@
            -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
            -I$(top_srcdir)/IlmImf
 
-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \
-	-L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \
-	-L$(top_builddir)/IlmImf \
-	-lIlmImf -lIlmThread -lImath -lHalf -lIex -lz
+LDADD = \
+	$(top_builddir)/Imath/libImath.la \
+	$(top_builddir)/IlmImf/libIlmImf.la \
+	$(top_builddir)/Iex/libIex.la \
+	$(top_builddir)/Half/libHalf.la \
+	$(top_builddir)/IlmThread/libIlmThread.la \
+	-lz
 
 exrmaketiled_SOURCES = main.cpp Image.h Image.cpp makeTiled.cpp makeTiled.h
 
Index: exrstdattr/Makefile.am
===================================================================
RCS file: /cvsroot/openexr/OpenEXR/exrstdattr/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- exrstdattr/Makefile.am	11 Aug 2005 00:31:58 -0000	1.2
+++ exrstdattr/Makefile.am	23 Aug 2005 05:24:08 -0000
@@ -6,10 +6,13 @@
            -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
            -I$(top_srcdir)/IlmImf
 
-LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \
-	-L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \
-	-L$(top_builddir)/IlmImf \
-	-lIlmImf -lIlmThread -lImath -lHalf -lIex -lz
+LDADD = \
+	$(top_builddir)/Imath/libImath.la \
+	$(top_builddir)/IlmImf/libIlmImf.la \
+	$(top_builddir)/Iex/libIex.la \
+	$(top_builddir)/Half/libHalf.la \
+	$(top_builddir)/IlmThread/libIlmThread.la \
+	-lz
 
 exrstdattr_SOURCES = main.cpp