equal
deleted
inserted
replaced
28 # |
28 # |
29 |
29 |
30 BUILDDIR = .. |
30 BUILDDIR = .. |
31 PRODUCT = sun |
31 PRODUCT = sun |
32 include $(BUILDDIR)/common/Defs.gmk |
32 include $(BUILDDIR)/common/Defs.gmk |
33 |
|
34 # Rhino/Mozilla java sources |
|
35 ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) |
|
36 ifneq ("$(ORG_EXISTS)", "") |
|
37 ORG_SUBDIR = org |
|
38 endif |
|
39 |
33 |
40 # Non windows subdirs |
34 # Non windows subdirs |
41 ifneq ($(PLATFORM), windows) |
35 ifneq ($(PLATFORM), windows) |
42 ifndef OPENJDK |
36 ifndef OPENJDK |
43 ifeq ($(PLATFORM), solaris) |
37 ifeq ($(PLATFORM), solaris) |
81 endif |
75 endif |
82 SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ |
76 SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ |
83 $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \ |
77 $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \ |
84 jawt font jpeg cmm $(DISPLAY_TOOLS) |
78 jawt font jpeg cmm $(DISPLAY_TOOLS) |
85 SUBDIRS_management = management |
79 SUBDIRS_management = management |
86 SUBDIRS_misc = $(ORG_SUBDIR) rmi tracing |
80 SUBDIRS_misc = rmi tracing |
87 SUBDIRS_tools = native2ascii serialver tools jconsole |
81 SUBDIRS_tools = native2ascii serialver tools jconsole |
88 |
82 |
89 ifndef OPENJDK |
83 ifndef OPENJDK |
90 SUBDIRS += usagetracker |
84 SUBDIRS += usagetracker |
91 endif |
85 endif |