--- a/components/watch/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/watch/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -18,15 +18,17 @@
#
# CDDL HEADER END
#
+
+#
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
-
+BUILD_BITS= 64
+COMPILER= gcc
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= procps-ng
COMPONENT_VERSION= 3.3.11
COMPONENT_PROJECT_URL= http://sourceforge.net/projects/procps-ng/
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
sha256:e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed
@@ -35,15 +37,12 @@
TPNO= 27264
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+INSTALL_TARGET= build
+TEST_TARGET= $(NO_TESTS)
+include $(WS_MAKE_RULES)/common.mk
-COMPILER = gcc
-CFLAGS += -I/usr/include/ncurses
-
-CONFIGURE_ENV += "CFLAGS=$(CFLAGS)"
+CFLAGS += -I$(USRINCDIR)/ncurses
# Always show the build and link lines for easier debugging.
COMPONENT_BUILD_ARGS += V=1
@@ -55,16 +54,4 @@
PKG_PROTO_DIRS += $(BUILD_DIR_64)
-ASLR_MODE = $(ASLR_ENABLE)
-
-build: $(BUILD_64)
-
-# Nothing to install.
-install: $(BUILD_64)
-
-test: $(NO_TESTS)
-
-system-test: $(NO_TESTS)
-
REQUIRED_PACKAGES += library/ncurses
-REQUIRED_PACKAGES += system/library