###############################################################################
# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
# 
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# 
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#

diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
--- src/Makefile.am	2008-01-11 20:50:30.986475000 -0800
+++ src/Makefile.am	2008-01-11 20:50:31.465732000 -0800
@@ -9,11 +9,13 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(XMU_CFLAGS)
 
-libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
-libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libXmu_la_LDFLAGS = -version-number 4:0:0 -no-undefined -M ../../../mapfile-Xmu
+libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined -M ../../../mapfile-Xmuu
 
-libXmu_la_LIBADD = $(XMU_LIBS)
-libXmuu_la_LIBADD = $(XMUU_LIBS)
+libXmu_la_DEPENDENCIES = libXmuu.so.1
+
+libXmu_la_LIBADD = $(XMU_LIBS) libXmuu.so.1 -lc
+libXmuu_la_LIBADD = $(XMUU_LIBS) -lc
 
 libXmuu_la_SOURCES = \
 	ClientWin.c \
@@ -23,7 +25,8 @@ libXmuu_la_SOURCES = \
 	Lower.c
 
 libXmu_la_SOURCES = \
-	$(libXmuu_la_SOURCES) \
+	CmapEquiv.c \
+	VisGamma.c \
 	AllCmap.c \
 	Atoms.c \
 	Clip.c \
@@ -79,7 +82,7 @@ lintlibdir = $(libdir)
 
 lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
 
-$(LINTLIB): $(libXmu_la_SOURCES)
+$(LINTLIB): $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES)
 	$(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) 
 
 $(LINTLIBUU): $(libXmuu_la_SOURCES)