diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am --- Pixie.orig/src/common/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/common/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,11 +1,10 @@ -lib_LTLIBRARIES = libcommon.la +lib_LTLIBRARIES = libpixiecommon.la -LIBCOMMON_CURRENT_VERSION=0 -LIBCOMMON_REVISION_VERSION=0 -LIBCOMMON_AGE_VERSION=0 +LIBPIXIECOMMON_CURRENT_VERSION=0 +LIBPIXIECOMMON_REVISION_VERSION=0 +LIBPIXIECOMMON_AGE_VERSION=0 -libcommon_la_LDFLAGS = -export-dynamic -version-info $(LIBCOMMON_CURRENT_VERSION):$(LIBCOMMON_REVISION_VERSION):$(LIBCOMMON_AGE_VERSION) +libpixiecommon_la_LDFLAGS = -export-dynamic -version-info $(LIBPIXIECOMMON_CURRENT_VERSION):$(LIBPIXIECOMMON_REVISION_VERSION):$(LIBPIXIECOMMON_AGE_VERSION) -libcommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp - +libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am --- Pixie.orig/src/file/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/file/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,7 +1,7 @@ displays_LTLIBRARIES = file.la file_la_SOURCES = file.cpp -file_la_LIBADD = ../common/libcommon.la @TIFF_LIBS@ +file_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ file_la_LDFLAGS = -module -avoid-version INCLUDES = -I.. diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am --- Pixie.orig/src/framebuffer/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/framebuffer/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -3,7 +3,7 @@ displays_LTLIBRARIES = framebuffer.la endif framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp -framebuffer_la_LIBADD = ../common/libcommon.la @X_LIBS@ +framebuffer_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@ framebuffer_la_LDFLAGS = -module -avoid-version @X_LDFLAGS@ framebuffer_la_CXXFLAGS = @X_CFLAGS@ diff -Naurp Pixie.orig/src/gui/Makefile.am Pixie/src/gui/Makefile.am --- Pixie.orig/src/gui/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/gui/Makefile.am 2007-02-12 04:32:46.000000000 +0000 @@ -4,14 +4,14 @@ if BUILD_SHOW endif #gui_la_SOURCES = opengl.cpp -#gui_la_LIBADD = ../common/libcommon.la @QT_LIBS@ +#gui_la_LIBADD = ../common/libpixiecommon.la @QT_LIBS@ #gui_la_CXXFLAGS = $(AM_CXXFLAGS) @QT_CXXFLAGS@ #gui_la_LDFLAGS = -module -avoid-version @QT_LDFLAGS@ # #INCLUDES = -I.. @QT_INCLUDES@ gui_la_SOURCES = opengl.cpp -gui_la_LIBADD = ../common/libcommon.la @X_LIBS@ +gui_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@ gui_la_CXXFLAGS = $(AM_CXXFLAGS) @X_CFLAGS@ @FLTK_CXXFLAGS@ gui_la_LDFLAGS = -module -avoid-version @FLTK_LDFLAGS@ @X_LDFLAGS@ diff -Naurp Pixie.orig/src/openexr/Makefile.am Pixie/src/openexr/Makefile.am --- Pixie.orig/src/openexr/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/openexr/Makefile.am 2007-02-12 04:30:28.000000000 +0000 @@ -3,7 +3,7 @@ if BUILD_OPENEXR endif openexr_la_SOURCES = openexr.cpp -openexr_la_LIBADD = ../common/libcommon.la @OPENEXR_LIBS@ +openexr_la_LIBADD = ../common/libpixiecommon.la @OPENEXR_LIBS@ openexr_la_LDFLAGS = -module -avoid-version @OPENEXR_LDFLAGS@ INCLUDES = -I.. @OPENEXR_INCLUDES@ diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am --- Pixie.orig/src/precomp/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/precomp/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -2,7 +2,7 @@ noinst_PROGRAMS = precomp precomp_SOURCES = precomp.cpp -precomp_LDADD = ../common/libcommon.la +precomp_LDADD = ../common/libpixiecommon.la INCLUDES = -I.. diff -Naurp Pixie.orig/src/rgbe/Makefile.am Pixie/src/rgbe/Makefile.am --- Pixie.orig/src/rgbe/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/rgbe/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,7 +1,7 @@ displays_LTLIBRARIES = rgbe.la rgbe_la_SOURCES = file.cpp rgbe.cpp -rgbe_la_LIBADD = ../common/libcommon.la +rgbe_la_LIBADD = ../common/libpixiecommon.la rgbe_la_LDFLAGS = -module -avoid-version INCLUDES = -I.. diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am --- Pixie.orig/src/ri/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/ri/Makefile.am 2007-02-12 04:30:59.000000000 +0000 @@ -69,7 +69,7 @@ libri_la_SOURCES = attributes.cpp \ xform.cpp \ zbuffer.cpp -libri_la_LIBADD = ../common/libcommon.la @TIFF_LIBS@ @ZLIB_LIBS@ +libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@ @ZLIB_LIBS@ INCLUDES = -I.. diff -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am --- Pixie.orig/src/rndr/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/rndr/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,7 +1,7 @@ bin_PROGRAMS = rndr rndr_SOURCES = rndr.cpp -rndr_LDADD = ../ri/libri.la ../common/libcommon.la +rndr_LDADD = ../ri/libri.la ../common/libpixiecommon.la INCLUDES = -I.. diff -Naurp Pixie.orig/src/sdr/Makefile.am Pixie/src/sdr/Makefile.am --- Pixie.orig/src/sdr/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/sdr/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -8,7 +8,7 @@ libsdr_la_LDFLAGS = -export-dynamic -ver libsdr_la_SOURCES = sdr.cpp -libsdr_la_LIBADD = ../common/libcommon.la +libsdr_la_LIBADD = ../common/libpixiecommon.la INCLUDES = -I.. diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am --- Pixie.orig/src/sdrc/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/sdrc/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,7 +1,7 @@ bin_PROGRAMS = sdrc sdrc_SOURCES = sdrc.cpp dso.cpp expression.cpp opcodes.cpp sdr.cpp sl.cpp pp1.c pp2.c pp3.c pp4.c pp5.c pp6.c pp7.c pp8.c -sdrc_LDADD = ../common/libcommon.la +sdrc_LDADD = ../common/libpixiecommon.la INCLUDES = -I.. diff -Naurp Pixie.orig/src/sdrinfo/Makefile.am Pixie/src/sdrinfo/Makefile.am --- Pixie.orig/src/sdrinfo/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/sdrinfo/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,7 +1,7 @@ bin_PROGRAMS = sdrinfo sdrinfo_SOURCES = sdrinfo.cpp -sdrinfo_LDADD = ../sdr/libsdr.la ../common/libcommon.la +sdrinfo_LDADD = ../sdr/libsdr.la ../common/libpixiecommon.la INCLUDES = -I.. diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am --- Pixie.orig/src/show/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/show/Makefile.am 2007-02-12 04:29:48.000000000 +0000 @@ -6,7 +6,7 @@ EXTRA_DIST = *.h show.dsp show_SOURCES = show.cpp -show_LDADD = ../common/libcommon.la ../ri/libri.la +show_LDADD = ../common/libpixiecommon.la ../ri/libri.la INCLUDES = -I.. diff -Naurp Pixie.orig/src/texmake/Makefile.am Pixie/src/texmake/Makefile.am --- Pixie.orig/src/texmake/Makefile.am 2006-10-14 01:52:39.000000000 +0000 +++ Pixie/src/texmake/Makefile.am 2007-02-12 04:28:52.000000000 +0000 @@ -1,7 +1,7 @@ bin_PROGRAMS = texmake texmake_SOURCES = texmake.cpp -texmake_LDADD = ../ri/libri.la ../common/libcommon.la +texmake_LDADD = ../ri/libri.la ../common/libpixiecommon.la INCLUDES = -I..