Print this page
lib: move compat links from targetdirs to proper makefiles

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libmalloc/Makefile.com
          +++ new/usr/src/lib/libmalloc/Makefile.com
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25      -# ident "%Z%%M% %I%     %E% SMI"
  26      -#
  27   25  
  28   26  LIBRARY=        libmalloc.a
  29   27  VERS=           .1
  30   28  
  31      -OBJECTS=        malloc.o
       29 +OBJECTS=        malloc.o
  32   30  
  33   31  # include library definitions
  34   32  include ../../Makefile.lib
  35   33  
  36   34  SRCDIR =        ../common
  37   35  
  38   36  LIBS =          $(DYNLIB) $(LINTLIB)
  39   37  
  40   38  LINTSRC=        $(LINTLIB:%.ln=%)
  41   39  LINTFLAGS +=    -erroff=E_BAD_PTR_CAST_ALIGN
  42   40  LINTFLAGS64 +=  -erroff=E_BAD_PTR_CAST_ALIGN
  43   41  
  44   42  CFLAGS +=       $(CCVERBOSE)
  45   43  CPPFLAGS +=     -I../../common/inc -D_REENTRANT
  46   44  DYNFLAGS +=     $(ZINTERPOSE)
  47   45  LDLIBS +=       -lc
       46 +
       47 +COMPATLINKS=    /usr/ccs/lib/libmalloc.so \
       48 +                /usr/ccs/lib/$(MACH64)/libmalloc.so
       49 +
       50 +$(ROOT)/usr/ccs/lib/libmalloc.so := COMPATLINKTARGET=../../lib/libmalloc.so.1
       51 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \
       52 +        COMPATLINKTARGET=../../../lib/$(MACH64)/libmalloc.so.1
  48   53  
  49   54  .KEEP_STATE:
  50   55  
  51   56  lint: lintcheck
  52   57  
  53   58  # include library targets
  54   59  include ../../Makefile.targ
  55   60  
  56   61  pics/%.o: ../common/%.c
  57   62                  $(COMPILE.c) -o $@ $<
  58   63                  $(POST_PROCESS_O)
  59   64  
  60   65  # install rule for lint library target
  61   66  $(ROOTLINTDIR)/%:       ../common/%
  62   67          $(INS.file)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX