changeset 7087:af16eb23cbc7

Change include order so that bundled header files are included before system header files. This prevents conflicts with system headers for libraries such as jpeg. Submitted by: jkim@FreeBSD.org
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 04 May 2014 14:45:00 -0700
parents 5c11f144d721
children 457de21d8b76
files make/sun/splashscreen/Makefile
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/splashscreen/Makefile	Mon Apr 28 16:32:29 2014 -0400
+++ b/make/sun/splashscreen/Makefile	Sun May 04 14:45:00 2014 -0700
@@ -61,6 +61,12 @@
 
 CFLAGS += -DSPLASHSCREEN
 
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ifneq ($(SYSTEM_ZLIB),true)
+  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+endif
+
 ifeq ($(PLATFORM), macosx)
   CFLAGS += -DWITH_MACOSX
 
@@ -122,11 +128,7 @@
   CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
   CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
 endif
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-ifneq ($(SYSTEM_ZLIB),true)
-  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-else
+ifeq ($(SYSTEM_ZLIB),true)
   OTHER_CFLAGS += $(ZLIB_CFLAGS)
   OTHER_LDLIBS += $(ZLIB_LIBS)
 endif