equal
deleted
inserted
replaced
18 |
18 |
19 SUBSYSTEMS = \ |
19 SUBSYSTEMS = \ |
20 javacaptain \ |
20 javacaptain \ |
21 javainstaller \ |
21 javainstaller \ |
22 javaregistry \ |
22 javaregistry \ |
23 javabackup |
23 javabackup \ |
|
24 javasettings |
24 |
25 |
25 COMPONENTS = \ |
26 COMPONENTS = \ |
26 preinstaller/build \ |
27 preinstaller/build \ |
27 debugapi/build \ |
28 debugapi/build \ |
28 javalauncher/build \ |
29 javalauncher/build |
29 javaupgradeapp/build |
30 |
30 |
|
31 NONQTSUBSYSTEMS = \ |
31 NONQTSUBSYSTEMS = \ |
32 javarecognizer/build |
32 javasidchecker/build \ |
|
33 javarecognizer/build \ |
|
34 javaappschemeplugin/build |
33 |
35 |
34 SYMBIAN_ONLY = \ |
36 SYMBIAN_ONLY = \ |
35 javaregistry \ |
37 javaregistry \ |
36 javalauncher/build \ |
38 javalauncher/build \ |
37 javaupgradeapp/build \ |
|
38 javabackup \ |
39 javabackup \ |
|
40 javasidchecker/build \ |
39 javarecognizer/build \ |
41 javarecognizer/build \ |
40 preinstaller/build \ |
42 preinstaller/build \ |
41 debugapi/build |
43 debugapi/build \ |
|
44 javaappschemeplugin/build |
42 |
45 |
43 ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
|
44 NONQTSUBSYSTEMS += javasidchecker/build javaappschemeplugin/build |
|
45 SYMBIAN_ONLY += javasidchecker/build javaappschemeplugin/build |
|
46 javasidchecker/build : javaregistry |
46 javasidchecker/build : javaregistry |
47 else |
|
48 COMPONENTS += javaappscheme/build javaqtrequest/build |
|
49 SYMBIAN_ONLY += javaappscheme/build javaqtrequest/build |
|
50 endif |
|
51 |
|
52 ifdef RD_JAVA_APPLICATION_SETTINGS_QT |
|
53 COMPONENTS += javasettings_qt/build |
|
54 SYMBIAN_ONLY += javasettings_qt/build |
|
55 else |
|
56 SUBSYSTEMS += javasettings |
|
57 endif |
|
58 |
|
59 # Declare that release preparation removes subdirectories not in build, except |
|
60 # listed special cases |
|
61 REMOVE_NOTBUILT_EXCLUDING = inc |
|
62 |
47 |
63 include ${JAVA_SRC_ROOT}/build/Makefile.subsystem |
48 include ${JAVA_SRC_ROOT}/build/Makefile.subsystem |