equal
deleted
inserted
replaced
56 endif |
56 endif |
57 HEADLESS_SUBDIR = headless |
57 HEADLESS_SUBDIR = headless |
58 XAWT_SUBDIR = xawt |
58 XAWT_SUBDIR = xawt |
59 endif |
59 endif |
60 |
60 |
|
61 ifeq ($(PLATFORM), macosx) |
|
62 LWAWT_PRE_SUBDIR = osxapp |
|
63 LWAWT_SUBDIR = lwawt |
|
64 endif |
|
65 |
61 ifndef OPENJDK |
66 ifndef OPENJDK |
|
67 ifneq ($(PLATFORM), macosx) |
62 JDBC_SUBDIR = jdbc |
68 JDBC_SUBDIR = jdbc |
63 endif |
69 endif |
|
70 endif |
|
71 |
64 ifdef OPENJDK |
72 ifdef OPENJDK |
65 RENDER_SUBDIR = pisces |
73 RENDER_SUBDIR = pisces |
66 else |
74 else |
67 RENDER_SUBDIR = dcpr |
75 RENDER_SUBDIR = dcpr |
68 endif |
76 endif |
76 else |
84 else |
77 DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR) |
85 DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR) |
78 DISPLAY_TOOLS = applet |
86 DISPLAY_TOOLS = applet |
79 endif |
87 endif |
80 SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ |
88 SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ |
81 $(DISPLAY_LIBS) $(DGA_SUBDIR) \ |
89 $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \ |
82 jawt font jpeg cmm $(DISPLAY_TOOLS) beans |
90 jawt font jpeg cmm $(DISPLAY_TOOLS) beans |
83 SUBDIRS_management = management |
91 SUBDIRS_management = management |
84 SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing |
92 SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing |
85 SUBDIRS_tools = native2ascii serialver tools jconsole |
93 SUBDIRS_tools = native2ascii serialver tools jconsole |
86 |
94 |