1.1 --- a/make/common/Rules.gmk Fri Aug 13 11:38:10 2010 -0700
1.2 +++ b/make/common/Rules.gmk Mon Aug 30 14:39:42 2010 -0700
1.3 @@ -34,7 +34,7 @@
1.4 #
1.5 # Directory set up. (Needed by deploy workspace)
1.6 #
1.7 -$(CLASSDESTDIR) $(CLASSHDRDIR) $(OBJDIR) $(OUTPUTDIR) $(BINDIR) $(LIBDIR) $(LIBDIR)/$(LIBARCH) $(TEMPDIR) $(EXTDIR):
1.8 +$(CLASSDESTDIR) $(OUTPUTDIR) $(TEMPDIR) $(EXTDIR):
1.9 $(MKDIR) -p $@
1.10
1.11 #
1.12 @@ -163,9 +163,6 @@
1.13 # List of class files needed
1.14 FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
1.15
1.16 -# Got to include exported files.
1.17 -FILES_class += $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
1.18 -
1.19 # Construct list of java sources we need to compile
1.20 source_list_prime:
1.21 @$(MKDIR) -p $(TEMPDIR)
1.22 @@ -214,50 +211,7 @@
1.23 classes.clean: packages.clean
1.24 $(RM) $(JAVA_SOURCE_LIST)
1.25
1.26 -#
1.27 -# C and C++ make dependencies
1.28 -#
1.29 -include $(TOPDIR)/make/common/internal/NativeCompileRules.gmk
1.30 -
1.31 -#
1.32 -# Running Javah to generate stuff into CClassHeaders.
1.33 -#
1.34 -
1.35 -ifdef FILES_export
1.36 -
1.37 -CLASSES.export = $(subst /,.,$(FILES_export:%.java=%))
1.38 -CLASSES.export += $(subst /,.,$(FILES_export2:%.java=%))
1.39 -CLASSES.export += $(subst /,.,$(FILES_export3:%.java=%))
1.40 -CLASSES_export = $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
1.41 -CLASSES_export += $(FILES_export2:%.java=$(CLASSDESTDIR)/%.class)
1.42 -CLASSES_export += $(FILES_export3:%.java=$(CLASSDESTDIR)/%.class)
1.43 -
1.44 -# Fix when deploy workspace makefiles don't depend on this name
1.45 -#CLASSHDR_DOTFILE=$(CLASSHDRDIR)/.classheaders
1.46 -
1.47 -CLASSHDR_DOTFILE=$(OBJDIR)/.class.headers.$(ARCH)
1.48 -
1.49 -classheaders: classes $(CLASSHDR_DOTFILE)
1.50 -
1.51 -$(CLASSHDR_DOTFILE): $(CLASSES_export)
1.52 - $(prep-target)
1.53 - $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
1.54 - $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
1.55 - @$(java-vm-cleanup)
1.56 - @$(TOUCH) $@
1.57 -
1.58 -classheaders.clean:
1.59 - $(RM) -r $(CLASSHDRDIR) $(CLASSHDR_DOTFILE)
1.60 -
1.61 -else # FILES_export
1.62 -
1.63 -classheaders: classes
1.64 -
1.65 -classheaders.clean:
1.66 -
1.67 -endif # FILES_export
1.68 -
1.69 -clean clobber:: classheaders.clean classes.clean .delete.classlist
1.70 +clean clobber:: classes.clean .delete.classlist
1.71
1.72 #
1.73 # Default dependencies
1.74 @@ -265,12 +219,11 @@
1.75
1.76 all: build
1.77
1.78 -build: classheaders
1.79 +build: classes
1.80
1.81 default: all
1.82
1.83 .PHONY: all build clean clobber \
1.84 .delete.classlist classes .compile.classlist classes.clean \
1.85 - classheaders classheaders.clean \
1.86 batch_compile
1.87
