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

@@ -86,20 +86,10 @@
 BINARY          =
 
 CLOBBERFILES    += $(GENUNIX)
 
 #
-# 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 =
-
-# 
 # lint pass one enforcement 
 # 
 CFLAGS += $(CCVERBOSE)
 CPPFLAGS += -I$(SRC)/common
 CPPFLAGS += -I$(SRC)/uts/common/fs/zfs

@@ -159,14 +149,14 @@
 install:        $(INSTALL_DEPS)
 
 $(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
         $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
 
-$(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
+$(GENUNIX): $(OBJECTS)
         @pwd
         $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
-        $(CTFMERGE_GENUNIX_MERGE)
+        $(CTFMERGE_MODULE)
         $(POST_PROCESS)
 
 $(OBJECTS): $(OBJS_DIR)
 
 #