--- a/make/sun/splashscreen/FILES_c.gmk Fri Oct 26 22:21:45 2007 -0700
+++ b/make/sun/splashscreen/FILES_c.gmk Thu Nov 01 10:52:47 2007 +0200
@@ -31,21 +31,6 @@ FILES_c = \
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 \
@@ -108,3 +93,20 @@ FILES_c = \
jfdctfst.c \
jfdctint.c
+FILES_png_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 \
+
--- a/make/sun/splashscreen/Makefile Fri Oct 26 22:21:45 2007 -0700
+++ b/make/sun/splashscreen/Makefile Thu Nov 01 10:52:47 2007 +0200
@@ -40,6 +40,12 @@ FILES_export = \
FILES_export = \
java/awt/SplashScreen.java
+#
+# compile png C files if ALT_EXTERNAL_LIBPNG is not set
+#
+ifndef ALT_EXTERNAL_LIBPNG
+FILES_c += $(FILES_png_c)
+endif # ALT_EXTERNAL_LIBPNG not set
#
# Rules
@@ -65,6 +71,9 @@ 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
+ifdef ALT_EXTERNAL_LIBPNG
+ OTHER_LDLIBS += -lpng12
+endif # ALT_EXTERNAL_LIBPNG set
else # PLATFORM
CFLAGS += -DWITH_WIN32
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
@@ -78,7 +87,9 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR
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
+ifndef ALT_EXTERNAL_LIBPNG
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng
+endif # ALT_EXTERNAL_LIBPNG not set
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen