diff make/linux/makefiles/top.make @ 15280:417e2ae45b89

Merge
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 22 Apr 2014 18:22:40 -0700
parents 4ca6dc0799b6
children
line wrap: on
line diff
--- a/make/linux/makefiles/top.make	Sun Apr 20 20:37:27 2014 -0700
+++ b/make/linux/makefiles/top.make	Tue Apr 22 18:22:40 2014 -0700
@@ -80,7 +80,7 @@
 	@echo All done.
 
 # This is an explicit dependency for the sake of parallel makes.
-vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) trace_stuff jvmti_stuff sa_stuff dtrace_stuff
+vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) trace_stuff jvmti_stuff sa_stuff
 	@# We need a null action here, so implicit rules don't get consulted.
 
 $(Cached_plat): $(Plat_File)
@@ -102,9 +102,6 @@
 sa_stuff:
 	@$(MAKE) -f sa.make $(MFLAGS-adjusted)
 
-dtrace_stuff: $(Cached_plat) $(adjust-mflags)
-	@$(MAKE) -f dtrace.make dtrace_gen_headers $(MFLAGS-adjusted) GENERATED=$(GENERATED)
-
 # and the VM: must use other makefile with dependencies included
 
 # We have to go to great lengths to get control over the -jN argument
@@ -122,7 +119,7 @@
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install: the_vm
+install gamma: the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"