*** 17,31 ****
  # 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.
  #
  #
  
  include         ../../Makefile.master
  include         ../Makefile.lib
  
  MANIFEST=       client.xml
  MANIFESTDIR=    $(ROOT)/var/svc/manifest/network/dns
--- 17,32 ----
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  #
! # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  #
  
+ 
  include         ../../Makefile.master
  include         ../Makefile.lib
  
  MANIFEST=       client.xml
  MANIFESTDIR=    $(ROOT)/var/svc/manifest/network/dns
*** 37,54 ****
  
  CHKMANIFEST=    $(MANIFEST:%.xml=%.xmlchk)
  
  SUBDIRS=        include $(MACH)
  $(BUILD64)SUBDIRS +=    $(MACH64)
- SUBDIRS +=      .WAIT irs
  
- # EXPORT DELETE START
- # CRYPT DELETE START
- SUBDIRS +=      cylink dnssafe
- # CRYPT DELETE END
- # EXPORT DELETE END
- 
  all :=          TARGET= all
  clean :=        TARGET= clean
  clobber :=      TARGET= clobber
  install :=      TARGET= install
  lint :=         TARGET= lint
--- 38,48 ----
*** 83,117 ****
  
  install_h: $(ROOTHDRS)
  
  check: $(CHECKHDRS) $(CHKMANIFEST)
  
- # EXPORT DELETE START
- # CRYPT DELETE START
- # Special targets to clean up the source tree for export distribution
- # Warning: These target change the source tree
- EXPORT_SRC:
-         $(RM) Makefile+
-         $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
-                 < Makefile > Makefile+
-         $(MV) Makefile+ Makefile
-         $(CHMOD) 444 Makefile
-         /usr/bin/find cylink dnssafe common/cylink common/dnssafe \
-                 -name SCCS -prune -o -type f -exec $(RM) {} \;
- 
- CRYPT_SRC:
-         $(RM) Makefile+
-         $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \
-                 < Makefile > Makefile+
-         $(MV) Makefile+ Makefile
-         $(CHMOD) 444 Makefile
-         /usr/bin/find cylink dnssafe common/cylink common/dnssafe \
-                 -name SCCS -prune -o -type f -exec $(RM) {} \;
- 
- # CRYPT DELETE END
- # EXPORT DELETE END
- 
  _msg:   $(MSGDOMAIN) $(POFILE)
          $(RM) $(MSGDOMAIN)/$(POFILE)
          $(CP) $(POFILE) $(MSGDOMAIN)
  
  $(POFILE):      $(POFILES)
--- 77,86 ----
*** 126,130 ****
--- 95,100 ----
  
  $(SUBDIRS): FRC
          @cd $@; pwd; $(MAKE) $(TARGET); echo
  
  FRC:
+