Changeset 74 for trunk


Ignore:
Timestamp:
Jul 21, 2010, 9:16:25 PM (15 years ago)
Author:
dmik
Message:

jdk/make: Adopted a huge bunch of makefiles to OS/2 (will be tested as they get used).

Location:
trunk/openjdk/jdk/make
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/com/sun/tools/attach/Exportedfiles.gmk

    r2 r74  
    2828#
    2929
    30 ifeq ($(PLATFORM), windows)
     30ifeq ($(filter-out windows os2,$(PLATFORM)),)
    3131FILES_export = \
    3232        sun/tools/attach/WindowsAttachProvider.java \

  • trunk/openjdk/jdk/make/com/sun/tools/attach/FILES_c.gmk

    r2 r74  
    2424#
    2525
    26 ifeq ($(PLATFORM),windows)
     26ifeq ($(filter-out windows os2,$(PLATFORM)),)
    2727FILES_c = \
    2828        WindowsAttachProvider.c \

  • trunk/openjdk/jdk/make/java/awt/Makefile

    r2 r74  
    6969CURSORDIR     = $(LIBDIR)/images/cursors
    7070
    71 ifeq ($(PLATFORM), windows)
     71ifeq ($(filter-out windows os2, $(PLATFORM)),)
    7272CURSORPROPSRC = $(TOPDIR)/src/windows/lib/images/cursors
    7373CURSORS   = $(CURSORDIR)/win32_CopyDrop32x32.gif      \

  • trunk/openjdk/jdk/make/java/java/Exportedfiles.gmk

    r2 r74  
    2727# These are the names of JAVA classes for which we will make .h files.
    2828#
    29 ifneq ($(PLATFORM), windows)
     29ifneq ($(filter-out windows os2, $(PLATFORM)),)
    3030FILES_export = \
    3131    java/lang/Object.java \

  • trunk/openjdk/jdk/make/java/java_hprof_demo/Makefile

    r2 r74  
    8181                 -I$(SHARE_SRC)/demo/jvmti/java_crw_demo
    8282
    83 ifeq ($(PLATFORM), windows)
     83ifeq ($(filter-out windows os2, $(PLATFORM)),)
    8484  OTHER_LDLIBS += wsock32.lib winmm.lib
    8585else

  • trunk/openjdk/jdk/make/java/main/Makefile

    r2 r74  
    3232include $(BUILDDIR)/common/Defs.gmk
    3333
    34 ifeq ($(PLATFORM), windows)
     34ifeq ($(filter-out windows os2, $(PLATFORM)),)
    3535SUBDIRS = java javaw
    3636else

  • trunk/openjdk/jdk/make/java/management/Makefile

    r2 r74  
    5353include Exportedfiles.gmk
    5454
    55 ifeq ($(PLATFORM),windows)
     55ifeq ($(filter-out windows os2, $(PLATFORM)),)
    5656
    5757FILES_c     +=  OperatingSystem_md.c
    … …  
    8686  -I$(SHARE_SRC)/native/sun/management
    8787
    88 ifeq ($(PLATFORM),windows)
     88ifeq ($(filter-out windows os2, $(PLATFORM)),)
    8989  OTHER_LDLIBS += $(JVMLIB)
    9090endif

  • trunk/openjdk/jdk/make/java/net/FILES_c.gmk

    r2 r74  
    4444endif
    4545
    46 ifeq ($(PLATFORM), windows)
     46ifeq ($(filter-out windows os2, $(PLATFORM)),)
    4747    FILES_c += TwoStacksPlainSocketImpl.c
    4848    FILES_c += DualStackPlainSocketImpl.c

  • trunk/openjdk/jdk/make/java/net/Makefile

    r2 r74  
    3737AUTO_FILES_JAVA_DIRS = java/net
    3838
    39 ifeq ($(PLATFORM), windows)
     39ifeq ($(filter-out windows os2, $(PLATFORM)),)
    4040    # Windows 9x module only needed on 32-bit build
    4141    ifeq ($(ARCH_DATA_MODEL), 32)
    … …  
    7272    sun/net/spi/DefaultProxySelector.java
    7373
    74 ifeq ($(PLATFORM), windows)
     74ifeq ($(filter-out windows os2, $(PLATFORM)),)
    7575    FILES_export += java/net/TwoStacksPlainSocketImpl.java
    7676    FILES_export += java/net/DualStackPlainSocketImpl.java
    … …  
    9393include $(BUILDDIR)/common/Library.gmk
    9494
    95 ifeq ($(PLATFORM), windows)
     95ifeq ($(filter-out windows os2, $(PLATFORM)),)
    9696  OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
    9797  # Will not compile at warning level 3 if warnings are fatal

  • trunk/openjdk/jdk/make/java/nio/Makefile

    r2 r74  
    7171endif # PLATFORM = solaris
    7272
    73 ifeq ($(PLATFORM), windows)
     73ifeq ($(filter-out windows os2, $(PLATFORM)),)
    7474FILES_java += \
    7575        sun/nio/ch/WindowsSelectorImpl.java \
    … …  
    8181FILES_export += \
    8282        sun/nio/ch/WindowsSelectorImpl.java
    83 endif # PLATFORM = windows
     83endif # PLATFORM = windows or os2
    8484
    8585ifeq ($(PLATFORM), linux)
    … …  
    130130  OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
    131131     -libpath:$(LIBDIR) java.lib \
     132     $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
     133     $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \
     134     $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
     135endif
     136ifeq ($(PLATFORM),os2)
     137  OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
     138     -L$(LIBDIR) java.lib \
    132139     $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
    133140     $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \

  • trunk/openjdk/jdk/make/javax/swing/plaf/Makefile

    r2 r74  
    3939AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
    4040
    41 ifeq ($(PLATFORM), windows)
    42     # Don't build GTK L&F on Windows
     41ifeq ($(filter-out windows os2, $(PLATFORM)),)
     42    # Don't build GTK L&F on Windows or OS/2
    4343    AUTO_JAVA_PRUNE = gtk
    4444endif
    … …  
    4949
    5050MISC_FILES = $(MISC_SWING_FILES)
    51 ifneq ($(PLATFORM), windows)
     51ifneq ($(filter-out windows os2, $(PLATFORM)),)
    5252    # Only include GTK icons on Solaris/Linux
    5353    MISC_FILES += $(MISC_SWING_FILES_UNIX)
    … …  
    7070        com/sun/java/swing/plaf/motif/resources/motif.properties \
    7171        com/sun/java/swing/plaf/windows/resources/windows.properties
    72 ifneq ($(PLATFORM), windows)
     72ifneq ($(filter-out windows os2, $(PLATFORM)),)
    7373    # Only compile GTK resource bundles on Solaris/Linux
    7474    RESOURCE_BUNDLES_COMPILED_PROPERTIES += \

  • trunk/openjdk/jdk/make/jpda/back/Makefile

    r2 r74  
    4949                 -I$(GENNATIVESRCDIR)/jdwp
    5050
    51 ifneq ($(PLATFORM), windows)
     51ifneq ($(filter-out windows os2, $(PLATFORM)),)
    5252  OTHER_LDLIBS += -ldl
    5353endif # PLATFORM
    … …  
    119119# Add to ambient vpath so we pick up the library files
    120120#
    121 ifeq ($(PLATFORM), windows)
     121ifeq ($(filter-out windows os2, $(PLATFORM)),)
    122122vpath %.c $(SHARE_SRC)/back:$(SHARE_SRC)/back
    123123endif # PLATFORM

  • trunk/openjdk/jdk/make/launchers/Makefile

    r2 r74  
    4444
    4545# Run MAKE $@ for all launchers
    46 ifeq ($(PLATFORM),windows)
     46ifeq ($(filter-out windows os2, $(PLATFORM)),)
    4747# Run MAKE $@ for all platform specific launchers
    4848define make-platform-specific-launchers

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

    r2 r74  
    142142  JCONSOLE_CLASSPATH = { "/lib/jconsole.jar", "/lib/tools.jar", "/classes" }
    143143  OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JCONSOLE_CLASSPATH)'
    144   ifeq ($(PLATFORM), windows)
     144  ifeq ($(filter-out windows os2, $(PLATFORM)),)
    145145    OTHER_CPPFLAGS += -DJAVAW
    146146    LDLIBS_COMMON  += user32.lib
    … …  
    151151# GUI tools
    152152ifeq ($(GUI_TOOL),true)
    153   ifneq ($(PLATFORM), windows)
     153  ifeq ($(filter-out windows os2, $(PLATFORM)),)
    154154    # Anything with a GUI needs X11 to be linked in.
    155155    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11

  • trunk/openjdk/jdk/make/mkdemo/jvmti/hprof/Makefile

    r2 r74  
    3636DEMO_OBJECTS    = java_crw_demo.$(OBJECT_SUFFIX)
    3737
    38 ifeq ($(PLATFORM), windows)
     38ifeq ($(filter-out windows os2, $(PLATFORM)),)
    3939  EXTRA_LIBS += wsock32.lib winmm.lib
    4040endif

  • trunk/openjdk/jdk/make/sun/Makefile

    r2 r74  
    3939
    4040# Non windows subdirs
    41 ifneq ($(PLATFORM), windows)
     41ifneq ($(filter-out windows os2, $(PLATFORM)),)
    4242  ifndef OPENJDK
    4343    ifeq ($(PLATFORM), solaris)

  • trunk/openjdk/jdk/make/sun/cmm/kcms/Makefile

    r2 r74  
    3333# Files
    3434#
    35 ifeq ($(PLATFORM), windows)
     35ifeq ($(filter-out windows os2, $(PLATFORM)),)
    3636include FILES_c_windows.gmk
    3737else # PLATFORM
    … …  
    8585vpath %.c   $(CLOSED_SRC)/share/native/$(PKGDIR)
    8686
    87 ifeq ($(PLATFORM), windows)
     87ifeq ($(filter-out windows os2, $(PLATFORM)),)
    8888
    8989OTHER_LDLIBS = user32.lib version.lib

  • trunk/openjdk/jdk/make/sun/dcpr/Makefile

    r2 r74  
    8282vpath %.c   $(SHARE_SRC)/native/sun/java2d/pipe
    8383
    84 ifneq ($(PLATFORM), windows)
     84ifneq ($(filter-out windows os2, $(PLATFORM)),)
    8585  OTHER_LDLIBS = $(LIBM)
    8686endif # PLATFORM

  • trunk/openjdk/jdk/make/sun/font/FILES_c.gmk

    r2 r74  
    113113
    114114
    115 ifeq ($(PLATFORM),windows)
     115ifeq ($(filter-out windows os2,$(PLATFORM)),)
    116116FILES_c_platform = fontpath.c
    117117FILES_cpp_platform = D3DTextRenderer.cpp

  • trunk/openjdk/jdk/make/sun/font/Makefile

    r2 r74  
    7575    sun/java2d/loops/GraphicsPrimitive.java
    7676
    77 ifeq ($(PLATFORM), windows)
     77ifeq ($(filter-out windows os2, $(PLATFORM)),)
    7878
    7979  # Files built here do not compile with warning level 3 if warnings are fatal
    … …  
    131131
    132132$(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX):
    133 ifeq ($(PLATFORM), windows)
     133ifeq ($(filter-out windows os2, $(PLATFORM)),)
    134134        $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@
    135135else
    … …  
    169169endif
    170170
    171 ifeq ($(PLATFORM), windows)
     171ifeq ($(filter-out windows os2, $(PLATFORM)),)
    172172vpath %.cpp   $(PLATFORM_SRC)/native/sun/windows
    173173vpath %.cpp   $(PLATFORM_SRC)/native/sun/java2d/d3d
    … …  
    205205            -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders
    206206
    207 ifeq ($(PLATFORM), windows)
     207ifeq ($(filter-out windows os2, $(PLATFORM)),)
    208208CPPFLAGS += -I$(PLATFORM_SRC)/native/sun/windows \
    209209            -I$(PLATFORM_SRC)/native/sun/java2d/d3d

  • trunk/openjdk/jdk/make/sun/font/t2k/Makefile

    r2 r74  
    6363    sun/font/T2KFontScaler.java
    6464
    65 ifeq ($(PLATFORM), windows)
     65ifeq ($(filter-out windows os2, $(PLATFORM)),)
    6666
    6767  # Files built here do not compile with warning level 3 if warnings are fatal
    … …  
    9999#
    100100# setup the list of libraries to link in...
    101 ifneq ($(PLATFORM), windows)
     101ifneq ($(filter-out windows os2, $(PLATFORM)),)
    102102  OTHER_LDLIBS  +=  $(LIBM) $(LIBCXX) -lfontmanager
    103103  ifeq ($(PLATFORM), linux)

  • trunk/openjdk/jdk/make/sun/jawt/Makefile

    r2 r74  
    3434# Files
    3535#
    36 ifeq ($(PLATFORM), windows)
     36ifeq ($(filter-out windows os2, $(PLATFORM)),)
    3737FILES_cpp = jawt.cpp
    3838else # PLATFORM
    … …  
    5050
    5151
    52 ifeq ($(PLATFORM), windows)
     52ifeq ($(filter-out windows os2, $(PLATFORM)),)
    5353#
    5454# Extra C flags.
    … …  
    142142build: $(FILES_h)
    143143
    144 ifeq ($(PLATFORM), windows)
     144ifeq ($(filter-out windows os2, $(PLATFORM)),)
    145145include make.depend
    146146endif

  • trunk/openjdk/jdk/make/sun/jdbc/Makefile

    r2 r74  
    5353# Use fake libraries on Solaris and Linux just so the library we create has
    5454#   a dependency on these two library names. (which are not part of the jdk)
    55 ifneq ($(PLATFORM), windows)
     55ifneq ($(filter-out windows os2, $(PLATFORM)),)
    5656  # In jdk5 and jdk6, and on Solaris 32bit, we would have required that
    5757  #    these two libraries exist at: $(ALT_ODBCDIR)/ISLIodbc/2.11/lib
    … …  
    8383# The UNIX define specifies conditional compilation for UNIX
    8484#
    85 ifeq ($(PLATFORM), windows)
     85ifeq ($(filter-out windows os2, $(PLATFORM)),)
    8686  LDLIBS += odbc32.lib odbccp32.lib
    8787else

  • trunk/openjdk/jdk/make/sun/jdga/Makefile

    r2 r74  
    5555vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)
    5656
    57 ifneq ($(PLATFORM), windows)
     57ifneq ($(filter-out windows os2, $(PLATFORM)),)
    5858  LDLIBS =  -ldga -lX11 -ldl -lc
    5959

  • trunk/openjdk/jdk/make/sun/net/FILES_java.gmk

    r2 r74  
    122122        sun/net/www/protocol/http/InMemoryCookieStore.java
    123123
    124 ifeq ($(PLATFORM), windows)
     124ifeq ($(filter-out windows os2, $(PLATFORM)),)
    125125    FILES_java += sun/net/www/protocol/http/NTLMAuthSequence.java
    126126endif

  • trunk/openjdk/jdk/make/sun/nio/Makefile

    r2 r74  
    4646
    4747# Exclude a few sources on windows
    48 ifeq ($(PLATFORM), windows)
     48ifeq ($(filter-out windows os2, $(PLATFORM)),)
    4949  AUTO_JAVA_PRUNE = sun/nio/cs/ext/COMPOUND_TEXT.java         \
    5050                    sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java \

  • trunk/openjdk/jdk/make/sun/rmi/Makefile

    r2 r74  
    4040
    4141SUBDIRS += rmi registry rmid
    42 ifeq ($(PLATFORM), windows)
     42ifeq ($(filter-out windows os2, $(PLATFORM)),)
    4343    SUBDIRS += cgi
    4444endif # PLATFORM

  • trunk/openjdk/jdk/make/sun/rmi/rmi/Makefile

    r2 r74  
    8686        sun.rmi.transport.DGCImpl
    8787
    88 ifeq ($(PLATFORM), windows)
     88ifeq ($(filter-out windows os2, $(PLATFORM)),)
    8989build: stubs
    9090else # PLATFORM

  • trunk/openjdk/jdk/make/sun/security/Makefile

    r2 r74  
    3939# build sun/security/jgss/wrapper on non-windows platform
    4040JGSS_WRAPPER =
    41 ifneq ($(PLATFORM), windows)
     41ifneq ($(filter-out windows os2, $(PLATFORM)),)
    4242    JGSS_WRAPPER = jgss/wrapper
    4343endif
    … …  
    4848PKCS11 = pkcs11
    4949ifeq ($(ARCH_DATA_MODEL), 64)
    50   ifeq ($(PLATFORM), windows)
     50  ifeq ($(filter-out windows os2, $(PLATFORM)),)
    5151    PKCS11 =
    5252  endif
    … …  
    5555# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
    5656MSCAPI =
    57 ifeq ($(PLATFORM), windows)
     57ifeq ($(filter-out windows os2, $(PLATFORM)),)
    5858  ifneq ($(ARCH_DATA_MODEL), 64)
    5959    MSCAPI = mscapi

  • trunk/openjdk/jdk/make/sun/security/jgss/wrapper/Makefile

    r2 r74  
    7272# Libraries to link
    7373#
    74 ifneq ($(PLATFORM), windows)
     74ifneq ($(filter-out windows os2, $(PLATFORM)),)
    7575  OTHER_LDLIBS = -ldl $(JVMLIB)
    7676endif

  • trunk/openjdk/jdk/make/sun/security/krb5/Makefile

    r2 r74  
    3434AUTO_FILES_JAVA_DIRS = sun/security/krb5
    3535
    36 ifeq ($(PLATFORM), windows)
     36ifeq ($(filter-out windows os2, $(PLATFORM)),)
    3737#
    3838# Java files that define native methods
    … …  
    6262# Rules
    6363#
    64 ifeq ($(PLATFORM), windows)
     64ifeq ($(filter-out windows os2, $(PLATFORM)),)
    6565  ifeq ($(JGSS_NATIVE_DIR_EXISTS), true)
    6666    include $(BUILDDIR)/common/Library.gmk
    … …  
    7373# Libraries to link
    7474#
    75 ifeq ($(PLATFORM), windows)
     75ifeq ($(filter-out windows os2, $(PLATFORM)),)
    7676  OTHER_LDLIBS = $(JVMLIB)
    7777else

  • trunk/openjdk/jdk/make/sun/security/mscapi/Makefile

    r2 r74  
    158158# Libraries to link
    159159#
    160 ifeq ($(PLATFORM), windows)
     160ifeq ($(filter-out windows os2, $(PLATFORM)),)
    161161  OTHER_LDLIBS += $(JVMLIB) Crypt32.Lib
    162162endif

  • trunk/openjdk/jdk/make/sun/security/pkcs11/Makefile

    r2 r74  
    156156# Libraries to link
    157157#
    158 ifeq ($(PLATFORM), windows)
     158ifeq ($(filter-out windows os2, $(PLATFORM)),)
    159159  OTHER_LDLIBS = $(JVMLIB)
    160160else

  • trunk/openjdk/jdk/make/sun/security/smartcardio/Makefile

    r2 r74  
    7373# Libraries to link
    7474#
    75 ifeq ($(PLATFORM), windows)
     75ifeq ($(filter-out windows os2, $(PLATFORM)),)
    7676  OTHER_LDLIBS = $(JVMLIB) winscard.lib
    7777else

  • trunk/openjdk/jdk/make/sun/splashscreen/Makefile

    r2 r74  
    6262CFLAGS += -DSPLASHSCREEN
    6363
    64 ifneq ($(PLATFORM), windows)
     64ifneq ($(filter-out windows os2, $(PLATFORM)),)
    6565  CFLAGS += -DWITH_X11
    6666  CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions

  • trunk/openjdk/jdk/make/tools/reorder/Makefile

    r2 r74  
    3737PRELOAD_DIR = $(ABS_OUTPUTDIR)/reorder/$(ARCH)
    3838
    39 ifeq ($(PLATFORM), windows)
     39ifeq ($(filter-out windows os2, $(PLATFORM)),)
    4040SEP = \\
    4141else
Note: See TracChangeset for help on using the changeset viewer.