Index: j2se/make/sun/splashscreen/FILES_c.gmk
===================================================================
--- j2se/make/sun/splashscreen/FILES_c.gmk	(revision 254)
+++ j2se/make/sun/splashscreen/FILES_c.gmk	(working copy)
@@ -31,21 +31,6 @@
 	splashscreen_jpeg.c \
 	splashscreen_png.c \
 	splashscreen_sys.c \
-	png.c \
-	pngerror.c \
-	pngget.c \
-	pngmem.c  \
-	pngpread.c \
-	pngread.c \
-	pngrio.c \
-	pngrtran.c \
-	pngrutil.c \
-	pngset.c \
-	pngtrans.c \
-	pngwio.c \
-	pngwrite.c \
-	pngwtran.c \
-	pngwutil.c \
 	dgif_lib.c \
 	gif_err.c \
 	gifalloc.c \
Index: j2se/make/sun/splashscreen/Makefile
===================================================================
--- j2se/make/sun/splashscreen/Makefile	(revision 254)
+++ j2se/make/sun/splashscreen/Makefile	(working copy)
@@ -64,7 +64,7 @@
 ifneq ($(PLATFORM), windows)
   CFLAGS += -DWITH_X11
   CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
-  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
+  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread -lpng12
 else # PLATFORM
   CFLAGS += -DWITH_WIN32
   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
@@ -78,7 +78,7 @@
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
 vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
+#vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng12
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
 vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen