Mercurial > hg > openjdk > bsd-port > jdk

changeset 5784:120a0326f76d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Adjust include order to avoid unintended includes caused by /usr/local/include (cups) coming before jdk specific include dirs.
author kurt
date Wed, 01 May 2013 09:00:47 -0400
parents ce83f5dff245
children 04ea4c2d0fd8
files make/sun/awt/mawt.gmk
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/awt/mawt.gmk	Sun Apr 28 16:36:12 2013 -0700
+++ b/make/sun/awt/mawt.gmk	Wed May 01 09:00:47 2013 -0400
@@ -193,16 +193,15 @@
 #
 # Other extra flags needed for compiling.
 #
+ifneq ($(PLATFORM), bsd))
 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
 
 ifndef HEADLESS
 CPPFLAGS += -I$(OPENWIN_HOME)/include 
 LDFLAGS  += -L$(OPENWIN_LIB)
-ifeq ($(OS_NAME), netbsd)
-LDFLAGS  += -Wl,-R$(OPENWIN_LIB)
-endif
 
 endif # !HEADLESS
+endif # !PLATFORM
 
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
@@ -226,13 +225,16 @@
         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
         $(EVENT_MODEL)
 
-ifeq ($(PLATFORM), macosx)
+ifneq (,$(findstring $(PLATFORM), bsd macosx))
 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
 
 ifndef HEADLESS
 CPPFLAGS += -I$(MOTIF_DIR)/include \
             -I$(OPENWIN_HOME)/include 
 LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
+ifeq ($(OS_NAME), netbsd)
+LDFLAGS  += -Wl,-R$(OPENWIN_LIB)
+endif
 
 endif # !HEADLESS
 endif # PLATFORM