Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7155585: Fix ifeq errors in makefiles [macosx]
authormichaelm
Fri, 23 Mar 2012 11:28:58 +0000
changeset 12292 0066b3386371
parent 12291 1be435e23542
child 12293 6c4b13381b81
7155585: Fix ifeq errors in makefiles [macosx] Reviewed-by: andrew, anthony, ohrstrom, dsamersoff
jdk/make/java/npt/Makefile file | annotate | diff | comparison | revisions
jdk/make/jpda/transport/socket/Makefile file | annotate | diff | comparison | revisions
jdk/make/sun/awt/mawt.gmk file | annotate | diff | comparison | revisions
jdk/make/sun/font/Makefile file | annotate | diff | comparison | revisions
jdk/make/sun/xawt/Makefile file | annotate | diff | comparison | revisions 
--- a/jdk/make/java/npt/Makefile	Thu Mar 22 12:30:43 2012 +0800
+++ b/jdk/make/java/npt/Makefile	Fri Mar 23 11:28:58 2012 +0000
@@ -68,7 +68,7 @@
 endif
 
 # Add location of iconv header
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
   OTHER_LDLIBS += -liconv
 endif
 
--- a/jdk/make/jpda/transport/socket/Makefile	Thu Mar 22 12:30:43 2012 +0800
+++ b/jdk/make/jpda/transport/socket/Makefile	Fri Mar 23 11:28:58 2012 +0000
@@ -40,7 +40,7 @@
   OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
 endif
 
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
   LIBSOCKET =
   OTHER_LDLIBS += -pthread
 endif
--- a/jdk/make/sun/awt/mawt.gmk	Thu Mar 22 12:30:43 2012 +0800
+++ b/jdk/make/sun/awt/mawt.gmk	Fri Mar 23 11:28:58 2012 +0000
@@ -208,7 +208,7 @@
                         $(wildcard /usr/include/X11/extensions))
 endif
 
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
               -I$(OPENWIN_HOME)/include 
 endif
--- a/jdk/make/sun/font/Makefile	Thu Mar 22 12:30:43 2012 +0800
+++ b/jdk/make/sun/font/Makefile	Fri Mar 23 11:28:58 2012 +0000
@@ -172,7 +172,7 @@
 # Libraries to link, and other C flags.
 #
 
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
 OTHER_INCLUDES += -I$(X11_PATH)/include
 OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
  ifeq ($(OS_VENDOR),Apple)
@@ -197,7 +197,7 @@
 
 # set up compile flags..
 
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
 CPPFLAGS += -I$(CLASSHDRDIR)
 endif
 
--- a/jdk/make/sun/xawt/Makefile	Thu Mar 22 12:30:43 2012 +0800
+++ b/jdk/make/sun/xawt/Makefile	Fri Mar 23 11:28:58 2012 +0000
@@ -56,7 +56,7 @@
 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
 endif
 
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
 LDFLAGS += -pthread
 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
 endif
jdk-sandbox