1.1 --- a/make/linux/makefiles/sa.make Fri Aug 17 16:47:04 2012 -0700
1.2 +++ b/make/linux/makefiles/sa.make Thu Aug 30 11:20:01 2012 -0400
1.3 @@ -30,10 +30,16 @@
1.4
1.5 include $(GAMMADIR)/make/linux/makefiles/rules.make
1.6
1.7 +include $(GAMMADIR)/make/defs.make
1.8 +include $(GAMMADIR)/make/altsrc.make
1.9 +
1.10 AGENT_DIR = $(GAMMADIR)/agent
1.11
1.12 include $(GAMMADIR)/make/sa.files
1.13
1.14 +-include $(HS_ALT_MAKE)/linux/makefiles/sa.make
1.15 +
1.16 +
1.17 TOPDIR = $(shell echo `pwd`)
1.18 GENERATED = $(TOPDIR)/../generated
1.19
1.20 @@ -52,17 +58,15 @@
1.21 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
1.22
1.23 # if $(AGENT_DIR) does not exist, we don't build SA
1.24 -# also, we don't build SA on Itanium, PowerPC, ARM or zero.
1.25 +# also, we don't build SA on Itanium or zero.
1.26
1.27 all:
1.28 if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
1.29 - -a "$(SRCARCH)" != "arm" \
1.30 - -a "$(SRCARCH)" != "ppc" \
1.31 -a "$(SRCARCH)" != "zero" ] ; then \
1.32 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
1.33 fi
1.34
1.35 -$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
1.36 +$(GENERATED)/sa-jdi.jar:: $(AGENT_FILES)
1.37 $(QUIETLY) echo "Making $@"
1.38 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
1.39 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
1.40 @@ -111,3 +115,5 @@
1.41 rm -rf $(SA_CLASSDIR)
1.42 rm -rf $(GENERATED)/sa-jdi.jar
1.43 rm -rf $(AGENT_FILES_LIST)
1.44 +
1.45 +-include $(HS_ALT_MAKE)/linux/makefiles/sa-rules.make
