OpenJDK / bsd-port / jdk9 / jdk
changeset 5196:a3327472e2d7
7155585: Fix ifeq errors in makefiles [macosx]
Reviewed-by: andrew, anthony, ohrstrom, dsamersoff
| author | michaelm |
|---|---|
| date | Fri, 23 Mar 2012 11:28:58 +0000 |
| parents | 1d418ec212ea |
| children | e7f813f2ea86 |
| files | make/java/npt/Makefile make/jpda/transport/socket/Makefile make/sun/awt/mawt.gmk make/sun/font/Makefile make/sun/xawt/Makefile |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/npt/Makefile Thu Mar 22 12:30:43 2012 +0800 +++ b/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/make/jpda/transport/socket/Makefile Thu Mar 22 12:30:43 2012 +0800 +++ b/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/make/sun/awt/mawt.gmk Thu Mar 22 12:30:43 2012 +0800 +++ b/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/make/sun/font/Makefile Thu Mar 22 12:30:43 2012 +0800 +++ b/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/make/sun/xawt/Makefile Thu Mar 22 12:30:43 2012 +0800 +++ b/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