diff options
Diffstat (limited to 'java/jdk16/files/patch-j2se-splashscreen-Makefile')
| -rw-r--r-- | java/jdk16/files/patch-j2se-splashscreen-Makefile | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/java/jdk16/files/patch-j2se-splashscreen-Makefile b/java/jdk16/files/patch-j2se-splashscreen-Makefile deleted file mode 100644 index c5661adb31cf..000000000000 --- a/java/jdk16/files/patch-j2se-splashscreen-Makefile +++ /dev/null @@ -1,32 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/sun/splashscreen/Makefile.orig 2008-10-13 20:02:03.000000000 -0700 -+++ ../../j2se/make/sun/splashscreen/Makefile 2008-10-14 18:53:48.000000000 -0700 -@@ -45,9 +45,16 @@ - - ifneq ($(PLATFORM), windows) - CFLAGS += -DWITH_X11 -+endif -+ -+# Internal JDK include paths should come before system include paths -+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen -+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 -+ -+ifneq ($(PLATFORM), windows) - ifeq ($(PLATFORM), bsd) - ifneq ($(OS_VENDOR), NetBSD) -- ICONV_DIR = /usr/local -+ ICONV_DIR = ${LOCALBASE} - ICONV_LIB = -L$(ICONV_DIR)/lib -liconv - endif - CPPFLAGS += -I$(OPENWIN_HOME)/include \ -@@ -75,9 +82,6 @@ - vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg - vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen - --CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen --CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 -- - # - # Has been converted to the JNI: generate JNI-style header files - # |