makefiles/Makefile

*** 36,60 ****
  
  # Setup the build tools.
  include Tools.gmk
  
  all: $(BUILD_TOOLS)
          +$(MAKE) -f GenerateJavaSources.gmk
- #       Drop back to the old makefiles for
- #       packages/libs that have not yet been converted.
-         +$(MAKE) -f LegacyMakefiles.gmk
  #       Ok, now gensrc is fully populated.
          +$(MAKE) -f GenerateData.gmk
          +$(MAKE) -f CompileJavaClasses.gmk
- #       The classes have been built, now generate
- #       classes that have other sources.
-         +$(MAKE) -f GenerateClasses.gmk
  #       The classes are now built and
  #       any javah files have now been generated.
          +$(MAKE) -f CompileNativeLibraries.gmk
  #       Finally compile the launchers.
          +$(MAKE) -f CompileLaunchers.gmk
  #       Now we have a complete jdk, which you can run.
  #       It is not yet wrapped up as an installed image.
  #       The demos are compiled against this jdk.
  ifndef NO_DEMOS
          +$(MAKE) -f CompileDemos.gmk
--- 36,60 ----
  
  # Setup the build tools.
  include Tools.gmk
  
  all: $(BUILD_TOOLS)
+ #       Import (corba jaxp jaxws langtools hotspot)
+         +$(MAKE) -f Import.gmk
+ #
          +$(MAKE) -f GenerateJavaSources.gmk
  #       Ok, now gensrc is fully populated.
          +$(MAKE) -f GenerateData.gmk
          +$(MAKE) -f CompileJavaClasses.gmk
  #       The classes are now built and
  #       any javah files have now been generated.
          +$(MAKE) -f CompileNativeLibraries.gmk
  #       Finally compile the launchers.
          +$(MAKE) -f CompileLaunchers.gmk
+ #       Generate classes that have other sources. Needs
+ #       to execute launchers.
+         +$(MAKE) -f GenerateClasses.gmk
  #       Now we have a complete jdk, which you can run.
  #       It is not yet wrapped up as an installed image.
  #       The demos are compiled against this jdk.
  ifndef NO_DEMOS
          +$(MAKE) -f CompileDemos.gmk
*** 62,81 ****
  #       Now copy the sample sources into the jdk.
  ifndef NO_SAMPLES
          +$(MAKE) -f CopySamples.gmk
  endif
  
- # Create the final jdk and jre images in the old way. Kept for reference
- # until conversion is fully done.
- old-images:
-         +$(MAKE) $(IMAGES_MAKE_ARGS) -f OldImages.gmk 
- 
  # Create the final jdk and jre images, to be wrapped up
  # into packages, or installed.
  images:
          +$(MAKE) -f CreateJars.gmk
!         +$(MAKE) $(IMAGES_MAKE_ARGS) -f Images.gmk 
  
  
  BINARIES:=$(shell if test -d $(IMAGES_OUTPUTDIR)/j2sdk-image/bin; then cd $(IMAGES_OUTPUTDIR)/j2sdk-image/bin && $(LS) ; fi)
  INSTALLDIR:=openjdk-$(RELEASE)
  
--- 62,76 ----
  #       Now copy the sample sources into the jdk.
  ifndef NO_SAMPLES
          +$(MAKE) -f CopySamples.gmk
  endif
  
  # Create the final jdk and jre images, to be wrapped up
  # into packages, or installed.
  images:
          +$(MAKE) -f CreateJars.gmk
!         +$(MAKE) -f Images.gmk 
  
  
  BINARIES:=$(shell if test -d $(IMAGES_OUTPUTDIR)/j2sdk-image/bin; then cd $(IMAGES_OUTPUTDIR)/j2sdk-image/bin && $(LS) ; fi)
  INSTALLDIR:=openjdk-$(RELEASE)
  
*** 88,98 ****
          $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
          $(CP) -rp $(IMAGES_OUTPUTDIR)/j2sdk-image/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
          $(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES))
          $(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
  
- # Create the deb,rpm,tgz,zip, packages.
- packages: images
-         echo Creating packages...well, in the future.
-         $(MKDIR) -p $(OUTPUT_ROOT)/packages
- 
  .PHONY: all install images
--- 83,88 ----