--- a/components/open-fabrics/perftest/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/open-fabrics/perftest/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -18,26 +18,22 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
-# OFED only builds with GCC
-COMPILER=gcc
-
-include ../../../make-rules/shared-macros.mk
+BUILD_BITS= 64
+include ../ofed-component-macros.mk
 
 COMPONENT_NAME=		perftest
 COMPONENT_VERSION=	1.3.0
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-0.42.gf350d3d.tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:164d32753ab87ba3152c84f69bf16bb592d77b922e66e753bd9ad0e229675793
-COMPONENT_ARCHIVE_URL=	http://www.openfabrics.org/downloads/perftest/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/ofuv_tools
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include ../ofed.mk
+INSTALL_TARGET=
+include ../ofed-component.mk
 
 MAN1FILES =	ib_clock_test.1 \
 		ib_write_bw.1 \
@@ -47,18 +43,16 @@
 
 include $(WS_MAKE_RULES)/shared-targets.mk
 
-LIBS +=         -lsocket -lnsl -lkstat -lrdmacm -libverbs -libumad -libmad
+LIBS += -lkstat -lrdmacm -libverbs -libumad -libmad
 
 LDFLAGS +=	-L$(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS))
 CFLAGS +=	$(SHARED_INCLUDES) -fgnu89-inline
 
-CONFIGURE_OPTIONS +=	--bindir=$(USRBINDIR)
-
 COMMON_ARGS  +=	CC="$(CC)"
 COMMON_ARGS  +=	CFLAGS="$(CFLAGS)"
 COMMON_ARGS  +=	LDFLAGS="$(LDFLAGS) $(LIBS)"
 COMMON_ARGS  +=	INSTALL=$(INSTALL)
-COMMON_ARGS  +=  BINDIR=$(CONFIGURE_BINDIR)/usr/bin
+COMMON_ARGS  += BINDIR=$(CONFIGURE_BINDIR.$(BITS))
 COMPONENT_BUILD_ARGS  +=	$(COMMON_ARGS)
 COMPONENT_INSTALL_ARGS  +=	$(COMMON_ARGS)
 
@@ -74,12 +68,5 @@
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
 # common targets
-configure:	$(CONFIGURE_64)
-
-build:		$(BUILD_64)
-
 install:	$(INSTALL_64) $(PROTOMAN1FILES)
 
-test:		$(NO_TESTS)
-
-system-test:    $(NO_TESTS)