1961 investigate stopping uniquifying CTF information
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>

*** 70,89 ****
  #
  CLOBBERFILES    += $(GENUNIX)
  CLEANFILES      += $(LIBSTUBS) $(LIBGEN)
  BINARY          =
  
- #
- # Non-patch genunix builds merge a version of the ip module called ipctf.  This
- # is to ensure that the common network-related types are included in genunix and
- # can thus be uniquified out of other modules.  We don't want to do this for
- # patch builds, since we can't guarantee that ip and genunix will be in the same
- # patch.
- #
- IPCTF_TARGET    = $(IPCTF)
- $(PATCH_BUILD)IPCTF_TARGET =
- 
  CPPFLAGS        += -I$(SRC)/common
  CPPFLAGS        += -I$(SRC)/uts/common/fs/zfs
  
  CPPFLAGS        += -I$(UTSBASE)/i86pc
  
--- 70,79 ----
*** 138,154 ****
  install:        $(INSTALL_DEPS)
  
  $(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
          $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
  
! $(IPCTF_TARGET) ipctf_target: FRC
!         @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR)
!         @pwd
! 
! $(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
!         $(CTFMERGE_GENUNIX_MERGE)
          $(POST_PROCESS)
  
  #
  #       Include common targets.
  #
--- 128,140 ----
  install:        $(INSTALL_DEPS)
  
  $(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
          $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
  
! $(GENUNIX): $(OBJECTS)
          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
!         $(CTFMERGE_MODULE)
          $(POST_PROCESS)
  
  #
  #       Include common targets.
  #