--- openexr-1.4.0/HalfTest/Makefile.in 2006-08-09 01:45:50.000000000 -0400 +++ openexr-1.4.0-patched/HalfTest/Makefile.in 2007-04-30 15:44:56.000000000 -0400 @@ -204,7 +204,7 @@ testSize.h INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Half -I$(top_srcdir)/config -LDADD = -L$(top_builddir)/Half -lHalf +LDADD = $(top_builddir)/Half/libHalf.la TESTS = HalfTest all: all-am @@ -248,7 +248,7 @@ done HalfTest$(EXEEXT): $(HalfTest_OBJECTS) $(HalfTest_DEPENDENCIES) @rm -f HalfTest$(EXEEXT) - $(CXXLINK) $(HalfTest_LDFLAGS) $(HalfTest_OBJECTS) $(HalfTest_LDADD) $(LIBS) + $(CXXLINK) $(HalfTest_LDADD) $(HalfTest_LDFLAGS) $(HalfTest_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/IexTest/Makefile.in 2006-08-09 01:45:51.000000000 -0400 +++ openexr-1.4.0-patched/IexTest/Makefile.in 2007-04-30 15:45:21.000000000 -0400 @@ -195,7 +195,7 @@ target_alias = @target_alias@ IexTest_SOURCES = main.cpp testBaseExc.cpp testBaseExc.h INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config -LDADD = -L$(top_builddir)/Iex -lIex +LDADD = $(top_builddir)/Iex/libIex.la TESTS = IexTest all: all-am @@ -239,7 +239,7 @@ done IexTest$(EXEEXT): $(IexTest_OBJECTS) $(IexTest_DEPENDENCIES) @rm -f IexTest$(EXEEXT) - $(CXXLINK) $(IexTest_LDFLAGS) $(IexTest_OBJECTS) $(IexTest_LDADD) $(LIBS) + $(CXXLINK) $(IexTest_LDADD) $(IexTest_LDFLAGS) $(IexTest_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/IlmImf/Makefile.in 2006-08-09 01:45:51.000000000 -0400 +++ openexr-1.4.0-patched/IlmImf/Makefile.in 2007-04-30 14:28:50.000000000 -0400 @@ -382,7 +382,7 @@ rm -f "$${dir}/so_locations"; \ done libIlmImf.la: $(libIlmImf_la_OBJECTS) $(libIlmImf_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libIlmImf_la_LDFLAGS) $(libIlmImf_la_OBJECTS) $(libIlmImf_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(libdir) $(libIlmImf_la_LIBADD) $(libIlmImf_la_LDFLAGS) $(libIlmImf_la_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/IlmImfExamples/Makefile.in 2006-08-09 01:45:51.000000000 -0400 +++ openexr-1.4.0-patched/IlmImfExamples/Makefile.in 2007-04-30 15:46:22.000000000 -0400 @@ -214,10 +214,11 @@ -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config -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)/Iex/libIex.la \ + $(top_builddir)/Half/libHalf.la \ + $(top_builddir)/Imath/libImath.la \ + $(top_builddir)/IlmThread/libIlmThread.la \ + $(top_builddir)/IlmImf/libIlmImf.la imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \ rgbaInterfaceTiledExamples.cpp \ @@ -274,7 +275,7 @@ done imfexamples$(EXEEXT): $(imfexamples_OBJECTS) $(imfexamples_DEPENDENCIES) @rm -f imfexamples$(EXEEXT) - $(CXXLINK) $(imfexamples_LDFLAGS) $(imfexamples_OBJECTS) $(imfexamples_LDADD) $(LIBS) + $(CXXLINK) $(imfexamples_LDADD) $(imfexamples_LDFLAGS) $(imfexamples_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/IlmImfTest/Makefile.in 2006-08-09 01:45:51.000000000 -0400 +++ openexr-1.4.0-patched/IlmImfTest/Makefile.in 2007-04-30 15:47:12.000000000 -0400 @@ -249,10 +249,11 @@ -I$(top_srcdir)/Imath -I$(top_srcdir)/IlmImf \ -I$(top_srcdir)/IlmThread -I$(top_srcdir)/config -LDADD = -L$(top_builddir)/Iex -L$(top_builddir)/Half \ - -L$(top_builddir)/Imath -L$(top_builddir)/IlmThread \ - -L$(top_builddir)/IlmImf \ - -lIlmImf -lIlmThread -lImath -lIex -lHalf -lz +LDADD = $(top_builddir)/Iex/libIex.la \ + $(top_builddir)/Half/libHalf.la \ + $(top_builddir)/Imath/libImath.la \ + $(top_builddir)/IlmThread/libIlmThread.la \ + $(top_builddir)/IlmImf/libIlmImf.la -lz TESTS = IlmImfTest EXTRA_DIST = comp_none.exr comp_piz.exr comp_rle.exr comp_zip.exr \ @@ -302,7 +303,7 @@ done IlmImfTest$(EXEEXT): $(IlmImfTest_OBJECTS) $(IlmImfTest_DEPENDENCIES) @rm -f IlmImfTest$(EXEEXT) - $(CXXLINK) $(IlmImfTest_LDFLAGS) $(IlmImfTest_OBJECTS) $(IlmImfTest_LDADD) $(LIBS) + $(CXXLINK) $(IlmImfTest_LDADD) $(IlmImfTest_LDFLAGS) $(IlmImfTest_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/IlmThread/Makefile.in 2006-08-09 01:45:51.000000000 -0400 +++ openexr-1.4.0-patched/IlmThread/Makefile.in 2007-04-30 14:29:06.000000000 -0400 @@ -290,7 +290,7 @@ rm -f "$${dir}/so_locations"; \ done libIlmThread.la: $(libIlmThread_la_OBJECTS) $(libIlmThread_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libIlmThread_la_LDFLAGS) $(libIlmThread_la_OBJECTS) $(libIlmThread_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(libdir) $(libIlmThread_la_LIBADD) $(libIlmThread_la_LDFLAGS) $(libIlmThread_la_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/Imath/Makefile.in 2006-08-09 01:45:52.000000000 -0400 +++ openexr-1.4.0-patched/Imath/Makefile.in 2007-04-30 14:29:20.000000000 -0400 @@ -298,7 +298,7 @@ rm -f "$${dir}/so_locations"; \ done libImath.la: $(libImath_la_OBJECTS) $(libImath_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libImath_la_LDFLAGS) $(libImath_la_OBJECTS) $(libImath_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(libdir) $(libImath_la_LIBADD) $(libImath_la_LDFLAGS) $(libImath_la_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/ImathTest/Makefile.in 2006-08-09 01:45:52.000000000 -0400 +++ openexr-1.4.0-patched/ImathTest/Makefile.in 2007-04-30 15:47:58.000000000 -0400 @@ -208,8 +208,9 @@ INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Imath -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \ -I$(top_srcdir)/config -LDADD = -L$(top_builddir)/Imath -L$(top_builddir)/Iex -L$(top_builddir)/Half \ - -lImath -lIex -lHalf +LDADD = $(top_builddir)/Imath/libImath.la \ + $(top_builddir)/Iex/libIex.la \ + $(top_builddir)/Half/libHalf.la TESTS = ImathTest all: all-am @@ -254,7 +255,7 @@ done ImathTest$(EXEEXT): $(ImathTest_OBJECTS) $(ImathTest_DEPENDENCIES) @rm -f ImathTest$(EXEEXT) - $(CXXLINK) $(ImathTest_LDFLAGS) $(ImathTest_OBJECTS) $(ImathTest_LDADD) $(LIBS) + $(CXXLINK) $(ImathTest_LDADD) $(ImathTest_LDFLAGS) $(ImathTest_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/OpenEXR.pc.in 2006-08-09 01:37:49.000000000 -0400 +++ openexr-1.4.0-patched/OpenEXR.pc.in 2007-04-30 16:56:00.000000000 -0400 @@ -7,5 +7,5 @@ Name: OpenEXR Description: OpenEXR image library Version: @OPENEXR_VERSION@ -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz @PTHREAD_LIBS@ +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lIlmThread -lz @PTHREAD_LIBS@ Cflags: @PTHREAD_CFLAGS@ -I${OpenEXR_includedir} --- openexr-1.4.0/exrdisplay/ImageView.cpp 2006-06-05 20:09:29.000000000 -0400 +++ openexr-1.4.0-patched/exrdisplay/ImageView.cpp 2007-04-30 14:35:44.000000000 -0400 @@ -55,8 +55,6 @@ #endif #include #include -#elif defined HAVE_DARWIN -#include #else #include #endif --- openexr-1.4.0/exrdisplay/ImageViewFragShader.cpp 2006-06-08 02:11:07.000000000 -0400 +++ openexr-1.4.0-patched/exrdisplay/ImageViewFragShader.cpp 2007-04-30 14:35:15.000000000 -0400 @@ -47,11 +47,7 @@ #include "OpenEXRConfig.h" #include -#ifdef HAVE_DARWIN -#include -#else #include -#endif #define GL_GLEXT_PROTOTYPES #include --- openexr-1.4.0/exrdisplay/ImageViewFragShader.h 2006-06-05 20:07:50.000000000 -0400 +++ openexr-1.4.0-patched/exrdisplay/ImageViewFragShader.h 2007-04-30 14:35:55.000000000 -0400 @@ -49,11 +49,7 @@ #if defined _WIN32 || defined _WIN64 #include #endif -#ifdef HAVE_DARWIN -#include -#else #include -#endif #include --- openexr-1.4.0/exrdisplay/Makefile.in 2006-08-09 01:45:52.000000000 -0400 +++ openexr-1.4.0-patched/exrdisplay/Makefile.in 2007-04-30 15:48:18.000000000 -0400 @@ -295,7 +295,7 @@ done exrdisplay$(EXEEXT): $(exrdisplay_OBJECTS) $(exrdisplay_DEPENDENCIES) @rm -f exrdisplay$(EXEEXT) - $(CXXLINK) $(exrdisplay_LDFLAGS) $(exrdisplay_OBJECTS) $(exrdisplay_LDADD) $(LIBS) + $(CXXLINK) $(exrdisplay_LDADD) $(exrdisplay_LDFLAGS) $(exrdisplay_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/exrenvmap/Makefile.in 2006-08-09 01:45:52.000000000 -0400 +++ openexr-1.4.0-patched/exrenvmap/Makefile.in 2007-04-30 15:48:36.000000000 -0400 @@ -288,7 +288,7 @@ done exrenvmap$(EXEEXT): $(exrenvmap_OBJECTS) $(exrenvmap_DEPENDENCIES) @rm -f exrenvmap$(EXEEXT) - $(CXXLINK) $(exrenvmap_LDFLAGS) $(exrenvmap_OBJECTS) $(exrenvmap_LDADD) $(LIBS) + $(CXXLINK) $(exrenvmap_LDADD) $(exrenvmap_LDFLAGS) $(exrenvmap_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/exrheader/Makefile.in 2006-08-09 01:45:52.000000000 -0400 +++ openexr-1.4.0-patched/exrheader/Makefile.in 2007-04-30 15:49:02.000000000 -0400 @@ -268,7 +268,7 @@ done exrheader$(EXEEXT): $(exrheader_OBJECTS) $(exrheader_DEPENDENCIES) @rm -f exrheader$(EXEEXT) - $(CXXLINK) $(exrheader_LDFLAGS) $(exrheader_OBJECTS) $(exrheader_LDADD) $(LIBS) + $(CXXLINK) $(exrheader_LDADD) $(exrheader_LDFLAGS) $(exrheader_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/exrmakepreview/Makefile.in 2006-08-09 01:45:53.000000000 -0400 +++ openexr-1.4.0-patched/exrmakepreview/Makefile.in 2007-04-30 15:49:16.000000000 -0400 @@ -281,7 +281,7 @@ done exrmakepreview$(EXEEXT): $(exrmakepreview_OBJECTS) $(exrmakepreview_DEPENDENCIES) @rm -f exrmakepreview$(EXEEXT) - $(CXXLINK) $(exrmakepreview_LDFLAGS) $(exrmakepreview_OBJECTS) $(exrmakepreview_LDADD) $(LIBS) + $(CXXLINK) $(exrmakepreview_LDADD) $(exrmakepreview_LDFLAGS) $(exrmakepreview_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/exrmaketiled/Makefile.in 2006-08-09 01:45:53.000000000 -0400 +++ openexr-1.4.0-patched/exrmaketiled/Makefile.in 2007-04-30 15:49:29.000000000 -0400 @@ -282,7 +282,7 @@ done exrmaketiled$(EXEEXT): $(exrmaketiled_OBJECTS) $(exrmaketiled_DEPENDENCIES) @rm -f exrmaketiled$(EXEEXT) - $(CXXLINK) $(exrmaketiled_LDFLAGS) $(exrmaketiled_OBJECTS) $(exrmaketiled_LDADD) $(LIBS) + $(CXXLINK) $(exrmaketiled_LDADD) $(exrmaketiled_LDFLAGS) $(exrmaketiled_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- openexr-1.4.0/exrstdattr/Makefile.in 2006-08-09 01:45:53.000000000 -0400 +++ openexr-1.4.0-patched/exrstdattr/Makefile.in 2007-04-30 15:58:25.000000000 -0400 @@ -268,7 +268,7 @@ done exrstdattr$(EXEEXT): $(exrstdattr_OBJECTS) $(exrstdattr_DEPENDENCIES) @rm -f exrstdattr$(EXEEXT) - $(CXXLINK) $(exrstdattr_LDFLAGS) $(exrstdattr_OBJECTS) $(exrstdattr_LDADD) $(LIBS) + $(CXXLINK) $(exrstdattr_LDADD) $(exrstdattr_LDFLAGS) $(exrstdattr_OBJECTS) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT)