*** 16,71 ****
  # fields enclosed by brackets "[]" replaced with your own identifying
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  # Copyright (c) 2011, Joyent, Inc. All rights reserved.
  #
  
  PROG= zoneadmd
  
  include ../Makefile.cmd
- include ../Makefile.ctf
  
! $(64ONLY)SUBDIRS= $(MACH)
! $(BUILD64)SUBDIRS += $(MACH64)
  
! all     :=      TARGET = all
! install :=      TARGET = install
! clean   :=      TARGET = clean
! clobber :=      TARGET = clobber
! lint    :=      TARGET = lint
  
  XGETFLAGS += -a -x zoneadmd.xcl
  
- ROOTUSRLIBZONES                 = $(ROOT)/usr/lib/zones
- 
  .KEEP_STATE:
  
  .PARALLEL:
  
! all: $(SUBDIRS)
  
  $(PROG): $(OBJS)
          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
          $(POST_PROCESS)
  
! install: $(SUBDIRS)
!         -$(RM) $(ROOTUSRLIBZONES)/$(PROG)
!         -$(LN) $(ISAEXEC) $(ROOTUSRLIBZONES)/$(PROG)
  
! $(POFILE):
  
! clean clobebr lint:     $(SUBDIRS)
  
  check:
!         $(CSTYLE) -p -P *.c
  
- $(SUBDIRS):     FRC
-         @cd $@; pwd; $(MAKE) $(TARGET)
- 
- FRC:
- 
  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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  # Copyright (c) 2011, Joyent, Inc. All rights reserved.
  #
  
  PROG= zoneadmd
  
  include ../Makefile.cmd
  
! ROOTCMDDIR=     $(ROOTLIB)/zones
  
! OBJS= zoneadmd.o zcons.o vplat.o mcap.o zfd.o
! SRCS = $(OBJS:.o=.c)
! POFILE=zoneadmd_all.po
! POFILES= $(OBJS:%.o=%.po)
  
+ CFLAGS += $(CCVERBOSE)
+ CERRWARN += -_gcc=-Wno-switch
+ CERRWARN += -_gcc=-Wno-parentheses
+ CERRWARN += -_gcc=-Wno-uninitialized
+ 
+ LDLIBS += -lsocket -lzonecfg -lnsl -ldevinfo -ldevice -lnvpair \
+         -lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm -ltsnet -ltsol \
+         -linetutil -lscf -lproc
  XGETFLAGS += -a -x zoneadmd.xcl
  
  .KEEP_STATE:
  
  .PARALLEL:
  
! all: $(PROG)
  
  $(PROG): $(OBJS)
          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
          $(POST_PROCESS)
  
! install: all $(ROOTCMD)
  
! $(POFILE): $(POFILES)
!         $(RM) $@
!         $(CAT) $(POFILES) > $@
  
! clean:
!         $(RM) $(OBJS)
  
+ lint:   lint_SRCS
+ 
  check:
!         $(CSTYLE) -p -P $(SRCS:%=%)
  
  include ../Makefile.targ