Changeset 143

Timestamp:

Sep 4, 2010, 1:39:45 AM (15 years ago)

Author:

dmik

Message:

jdk/make: Fixed typos that would prevent launchers from building.

File:

• trunk/openjdk/jdk/make/launchers/Makefile.launcher (modified) (1 diff)

trunk/openjdk/jdk/make/launchers/Makefile.launcher

@@ -142 +142 @@
   JCONSOLE_CLASSPATH = { "/lib/jconsole.jar", "/lib/tools.jar", "/classes" }
   OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JCONSOLE_CLASSPATH)'
-  ifeq ($(filter-out windows os2, $(PLATFORM)),)
+  ifeq ($(PLATFORM), windows)
     OTHER_CPPFLAGS += -DJAVAW
     LDLIBS_COMMON  += user32.lib
     MAIN_JAVA_ARGS += -J-Djconsole.showOutputViewer
   endif
+  ifeq ($(PLATFORM), os2)
+    OTHER_CPPFLAGS += -DJAVAW
+    MAIN_JAVA_ARGS += -J-Djconsole.showOutputViewer
+  endif
 endif
 
 # GUI tools
 ifeq ($(GUI_TOOL),true)
-  ifeq ($(filter-out windows os2, $(PLATFORM)),)
+  ifneq ($(filter-out windows os2, $(PLATFORM)),)
     # Anything with a GUI needs X11 to be linked in.
     OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11