Changeset 263 for trunk/openjdk/jdk/make


Ignore:
Timestamp:
Feb 21, 2011, 12:02:20 AM (14 years ago)
Author:
dmik
Message:

make: Global DLL rename by adding the 'j' prefix to avoid possible conflicts with system DLLs (#52)

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

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/com/sun/java/pack/Makefile

    r2 r263  
    3333PRODUCT = sun
    3434PGRM = unpack200
     35
     36ifeq ($(PLATFORM), os2)
     37LIBRARY_SHORT = junpack
     38endif
     39
    3540include $(BUILDDIR)/common/Defs.gmk
    3641

  • trunk/openjdk/jdk/make/java/hpi/windows/Makefile

    r222 r263  
    3333LIB_LOCATION = $(BINDIR)
    3434
     35ifeq ($(PLATFORM), os2)
     36LIBRARY_SHORT = jhpi
     37endif
     38
    3539include $(BUILDDIR)/common/Defs.gmk
    3640
    … …  
    6670DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    6771$(DEF_FILE): $(MAKEFILE_LIST)
    68         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     72        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    6973        @$(ECHO) 'EXPORTS \n \
    7074  DLL_Initialize = "_DLL_Initialize@8" \n \

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

    r222 r263  
    3232PRODUCT = sun
    3333
    34 LIBRARY_SHORT = instrmnt
     34ifeq ($(PLATFORM), os2)
     35LIBRARY_SHORT = jinstr
     36endif
    3537
    3638# Configure the CFLAGS for this library.  Use static binding so that there
    … …  
    126128DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    127129$(DEF_FILE): $(MAKEFILE_LIST)
    128         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     130        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    129131        @$(ECHO) 'EXPORTS \n \
    130132  Agent_OnAttach = "_Agent_OnAttach@12" \n \

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

    r222 r263  
    5555
    5656$(DEF_FILE): $(MAKEFILE_LIST)
    57         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     57        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    5858        @$(ECHO) 'EXPORTS \n \
    5959  Canonicalize = _Canonicalize \n \

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

    r203 r263  
    2929LIBRARY_OUTPUT = java_crw_demo
    3030
     31ifeq ($(PLATFORM), os2)
    3132LIBRARY_SHORT = javacrwd
     33endif
    3234
    3335# Configure the CFLAGS for this library.

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

    r99 r263  
    2828PRODUCT = sun
    2929LIBRARY_OUTPUT = hprof_jvmti
     30
     31ifeq ($(PLATFORM), os2)
     32LIBRARY_SHORT = jhprof
     33endif
    3034
    3135# Configure the CFLAGS for this library.

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

    r222 r263  
    105105DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    106106$(DEF_FILE): $(MAKEFILE_LIST)
    107         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     107        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    108108        @$(ECHO) 'EXPORTS \n \
    109109  _JLI_ParseManifest \n \

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

    r203 r263  
    2929PRODUCT = java
    3030
    31 LIBRARY_SHORT = mngemnt
     31ifeq ($(PLATFORM), os2)
     32LIBRARY_SHORT = jmngmnt
     33endif
    3234
    3335include $(BUILDDIR)/common/Defs.gmk

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

    r101 r263  
    2828LIBRARY = net
    2929PRODUCT = sun
     30
     31ifeq ($(PLATFORM), os2)
     32LIBRARY_SHORT = jnet
     33endif
     34
    3035include $(BUILDDIR)/common/Defs.gmk
    3136

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

    r104 r263  
    3333PRODUCT = java
    3434OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
     35
     36ifeq ($(PLATFORM), os2)
     37LIBRARY_SHORT = jnio
     38endif
     39
    3540include $(BUILDDIR)/common/Defs.gmk
    3641

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

    r222 r263  
    2828PRODUCT = sun
    2929LIBRARY_OUTPUT = npt
     30
     31ifeq ($(PLATFORM), os2)
     32LIBRARY_SHORT = jnpt
     33endif
    3034
    3135# Configure the CFLAGS for this library.
    … …  
    7175DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    7276$(DEF_FILE): $(MAKEFILE_LIST)
    73         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     77        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    7478        @$(ECHO) 'EXPORTS \n \
    7579  nptInitialize = "_nptInitialize@12" \n \

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

    r2 r263  
    3232LIBRARY = verify
    3333include $(BUILDDIR)/common/Defs.gmk
     34
     35ifeq ($(PLATFORM), os2)
     36LIBRARY_SHORT = jverify
     37endif
    3438
    3539#

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

    r222 r263  
    2929LIBRARY = zip
    3030PRODUCT = sun
     31
     32ifeq ($(PLATFORM), os2)
     33LIBRARY_SHORT = jzip
     34endif
     35
    3136include $(BUILDDIR)/common/Defs.gmk
    3237
    … …  
    7378DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    7479$(DEF_FILE): $(MAKEFILE_LIST)
    75         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     80        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    7681        @$(ECHO) 'EXPORTS \n \
    7782  ZIP_CRC32 = _ZIP_CRC32 \n \

  • trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile

    r250 r263  
    3131LIBRARY  = dt_shmem
    3232PRODUCT = jbug
     33
     34ifeq ($(PLATFORM), os2)
     35LIBRARY_SHORT = jdtshmem
     36endif
    3337
    3438# Mapfile only used on Solaris/Linux
    … …  
    7983DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    8084$(DEF_FILE): $(MAKEFILE_LIST)
    81         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     85        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    8286        @$(ECHO) 'EXPORTS \n \
    8387  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \

  • trunk/openjdk/jdk/make/jpda/transport/socket/Makefile

    r249 r263  
    3030BUILDDIR = ../../..
    3131LIBRARY = dt_socket
    32 LIBRARY_SHORT = dt_sock
    3332PRODUCT = jbug
     33
     34ifeq ($(PLATFORM), os2)
     35LIBRARY_SHORT = jdtsock
     36endif
    3437
    3538# Mapfile only used on Solaris/Linux
    … …  
    9497DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    9598$(DEF_FILE): $(MAKEFILE_LIST)
    96         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     99        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    97100        @$(ECHO) 'EXPORTS \n \
    98101  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \

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

    r232 r263  
    2929include $(BUILDDIR)/common/Defs.gmk
    3030
     31ifeq ($(PLATFORM), os2)
     32DEMONAME_SHORT = jhprof
     33endif
     34
    3135DEMO_ROOT       = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
    3236DEMO_TOPFILES   = ./README.txt

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

    r234 r263  
    2828LIBRARY = awt
    2929PRODUCT = sun
     30
     31ifeq ($(PLATFORM), os2)
     32LIBRARY_SHORT = jawtos2
     33endif
    3034
    3135#

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

    r208 r263  
    2828LIBRARY = lcms
    2929PRODUCT = sun
     30
     31ifeq ($(PLATFORM), os2)
     32LIBRARY_SHORT = jlcms
     33endif
    3034
    3135include $(BUILDDIR)/common/Defs.gmk

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

    r213 r263  
    3333PRODUCT = sun
    3434
    35 LIBRARY_SHORT = fontmgr
     35ifeq ($(PLATFORM), os2)
     36LIBRARY_SHORT = jfontmgr
     37endif
    3638
    3739# Indicate we want the C++ compiler to do the linking.

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

    r257 r263  
    3333PRODUCT = sun
    3434
    35 LIBRARY_SHORT = mlibimg
     35ifeq ($(PLATFORM), os2)
     36LIBRARY_SHORT = jmlibimg
     37endif
    3638
    3739include $(BUILDDIR)/common/Defs.gmk
    … …  
    5860DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    5961$(DEF_FILE): $(MAKEFILE_LIST)
    60         @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     62        @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
    6163        @$(ECHO) 'EXPORTS \n \
    6264  j2d_mlib_ImageConvMxN = _j2d_mlib_ImageConvMxN \n \

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

    r2 r263  
    2929PRODUCT = sun
    3030include $(BUILDDIR)/common/Defs.gmk
     31
     32ifeq ($(PLATFORM), os2)
     33LIBRARY_SHORT = jjpeg
     34endif
    3135
    3236#

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

    r74 r263  
    3232PRODUCT = sun
    3333LIBRARY = rmi
     34
     35ifeq ($(PLATFORM), os2)
     36LIBRARY = jrmi
     37endif
     38
    3439include $(BUILDDIR)/common/Defs.gmk
    3540

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

    r203 r263  
    9494PRODUCT = sun
    9595
    96 LIBRARY_SHORT = smscapi
     96ifeq ($(PLATFORM), os2)
     97LIBRARY_SHORT = jsmscapi
     98endif
    9799
    98100#

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

    r208 r263  
    3030include $(BUILDDIR)/common/Defs.gmk
    3131
    32 LIBRARY_SHORT = splshscr
     32ifeq ($(PLATFORM), os2)
     33LIBRARY_SHORT = jsplash
     34endif
    3335
    3436#
Note: See TracChangeset for help on using the changeset viewer.