Ignore:
Timestamp:
Feb 21, 2011, 12:02:20 AM (15 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/jpda/transport
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • 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 \
Note: See TracChangeset for help on using the changeset viewer.