1575 untangle libmlrpc ... (libmlrpc)

*** 16,56 ****
  # fields enclosed by brackets "[]" replaced with your own identifying
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  LIBRARY =       libmlrpc.a
! VERS =          .1
  
  OBJS_COMMON =                   \
          ndr_client.o            \
          ndr_heap.o              \
          ndr_marshal.o           \
          ndr_ops.o               \
          ndr_process.o           \
          ndr_server.o            \
!         ndr_svc.o
  
  NDLLIST = rpcpdu
  
! OBJECTS=        $(OBJS_COMMON) $(OBJS_SHARED) $(NDLLIST:%=%_ndr.o)
  
- include ../../../Makefile.lib
  include ../../Makefile.lib
  
! INCS += -I$(SRC)/common/smbsrv
  
! LDLIBS +=       $(MACH_LDLIBS)
! LDLIBS +=       -lsmb -luuid -lc
  
  CPPFLAGS += $(INCS) -D_REENTRANT
  
! SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)                \
!         $(OBJS_SHARED:%.o=$(SRC)/common/smbsrv/%.c)
  
  include ../../Makefile.targ
! include ../../../Makefile.targ
--- 16,75 ----
  # fields enclosed by brackets "[]" replaced with your own identifying
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
+ 
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
+ # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ #
  
  LIBRARY =       libmlrpc.a
! VERS =          .2
  
  OBJS_COMMON =                   \
+         mlrpc_clh.o             \
          ndr_client.o            \
          ndr_heap.o              \
          ndr_marshal.o           \
          ndr_ops.o               \
          ndr_process.o           \
          ndr_server.o            \
!         ndr_svc.o               \
!         ndr_wchar.o
  
  NDLLIST = rpcpdu
  
! OBJECTS=        $(OBJS_COMMON) $(NDLLIST:%=%_ndr.o)
! CLEANFILES += $(NDLLIST:%=%_ndr.c)
  
  include ../../Makefile.lib
  
! LIBS=           $(DYNLIB) $(LINTLIB)
  
! LDLIBS +=       -lsmbfs -luuid -lc
  
+ SRCDIR=         ../common
+ SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)
+ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
+ 
+ NDLDIR =        $(SRCDIR)
+ 
+ CFLAGS +=       $(CCVERBOSE)
+ INCS = -I. -I$(SRCDIR)
  CPPFLAGS += $(INCS) -D_REENTRANT
  
! all:    $(LIBS)
  
+ lint:   lintcheck
+ 
  include ../../Makefile.targ
! 
! objs/%_ndr.o pics/%_ndr.o : %_ndr.c
! 
! %_ndr.c : $(NDLDIR)/%.ndl
!         $(NDRGEN) -Y $(ANSI_CPP) $(CPPFLAGS) $<
! 
! .KEEP_STATE: