← Back to branch summary

~ubuntu-branches/ubuntu/natty/icedtea-web/natty-proposed

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-11-24 13:23:28 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101124132328-2xb9z39vxga63vr9
Tags: 1.0~20101124-0ubuntu1
* Update to hg 20101124.
* Fix xulrunner dependencies for natty.
* Build-depend on pkg-config and libgtk2.0-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
8
8
# Build directories
9
9
 
10
10
BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
11
 
 
12
 
# PR43578 - java.security.CodeSource.getCodeSigners() missing
13
 
# PR43582 - Missing javax.swing.JTable.setFillsViewportHeight
14
 
# PR43585 - java.security.KeyStore.TrustedCertificateEntry class missing
15
 
NETX_BOOTSTRAP_CLASSES = \
16
 
        $(SHARE)/java/security/CodeSource.java \
17
 
        $(SHARE)/javax/swing/JTable.java \
18
 
        $(SHARE)/java/security/KeyStore.java
19
 
 
20
 
# PR46074 - Missing java.net cookie code required by IcedTea plugin
21
 
PLUGIN_BOOTSTRAP_CLASSES = \
22
 
        $(SHARE)/java/net/CookieManager.java \
23
 
        $(SHARE)/java/net/HttpCookie.java \
24
 
        $(SHARE)/java/net/CookieHandler.java
25
 
 
26
 
# IT563 - NetX uses sun.security code
27
 
# IT564 - NetX depends on sun.misc.BASE64Encoder
28
 
# IT570 - NetX depends on sun.applet.AppletViewPanel
29
 
# IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java
30
 
NETX_SUN_CLASSES = \
31
 
        $(SHARE)/sun/security/provider/X509Factory.java \
32
 
        $(SHARE)/sun/security/util/SecurityConstants.java \
33
 
        $(SHARE)/sun/security/util/HostnameChecker.java \
34
 
        $(SHARE)/sun/security/util/DerValue.java \
35
 
        $(SHARE)/sun/security/x509/X500Name.java \
36
 
        $(SHARE)/sun/misc/BASE64Encoder.java \
37
 
        $(SHARE)/sun/applet/AppletViewerPanel.java \
38
 
        $(SHARE)/sun/security/validator/ValidatorException.java \
39
 
        $(SHARE)/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
40
 
 
41
 
# IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java
42
 
# IT574 - Plugin depends on sun.misc.Ref
43
 
# IT575 - Plugin depends on com.sun/jndi.toolkit.url.UrlUtil
44
 
# IT576 - Plugin depends on sun.applet.AppletImageRef
45
 
PLUGIN_SUN_CLASSES = \
46
 
        $(SOLARIS)/sun/awt/X11/XEmbeddedFrame.java \
47
 
        $(SHARE)/sun/misc/Ref.java \
48
 
        $(SHARE)/com/sun/jndi/toolkit/url/UrlUtil.java \
49
 
        $(SHARE)/sun/applet/AppletImageRef.java
50
 
 
51
11
RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar
52
12
 
53
13
# Flags
57
17
IT_CLASS_TARGET_VERSION=6
58
18
IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
59
19
 
 
20
JDK_UPDATE_VERSION=50
 
21
 
60
22
# Sources list
61
23
 
62
24
PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
95
57
LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o
96
58
PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
97
59
NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS))
98
 
LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
99
 
        -g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) -I$(BOOT_DIR)/include -I$(BOOT_DIR)/include/linux \
 
60
LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -pthread -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
 
61
        -g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \
100
62
        -DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
101
 
LAUNCHER_LINK = -o $@ -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
 
63
LAUNCHER_LINK = -o $@ -pthread -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
102
64
        -Wl,-soname=lib.so  -L $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli -Wl,-z -Wl,origin \
103
65
        -Wl,--allow-shlib-undefined -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \
104
 
        -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli  -ldl -lc -lz
 
66
        -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli $(X11_CFLAGS) $(X11_LIBS) -ljli  -ldl -lz
105
67
PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
106
68
 
107
 
EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop extra launcher
 
69
EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher
108
70
 
109
71
# Top-Level Targets
110
72
# =================
111
73
 
112
 
all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws
 
74
all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws \
 
75
 javaws.desktop
113
76
 
114
 
clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory clean-native-ecj
 
77
clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
 
78
 clean-native-ecj clean-desktop-files
115
79
 
116
80
.PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
117
 
 clean-bootstrap-directory clean-native-ecj
 
81
 clean-bootstrap-directory clean-native-ecj clean-desktop-files
118
82
 
119
83
install-exec-local:
120
84
        mkdir -p $(DESTDIR)$(bindir)
185
149
        $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "sun.applet.PluginMain" }' -DPROGNAME='"pluginappletviewer"'  -c -o $@ $<
186
150
 
187
151
$(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS)
188
 
        $(CC) $(LAUNCHER_LINK) $(PLUGIN_LAUNCHER_OBJECTS)
 
152
        $(CC) $(PLUGIN_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
189
153
 
190
154
clean-IcedTeaPlugin:
 
155
        rm -f $(PLUGIN_DIR)/launcher/*.o
 
156
        rm -f $(PLUGIN_DIR)/launcher/pluginappletviewer
 
157
        if [ -e $(PLUGIN_DIR)/launcher ]; then \
 
158
                rmdir $(PLUGIN_DIR)/launcher ; \
 
159
        fi
191
160
        rm -f $(PLUGIN_DIR)/*.o
192
161
        rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
193
162
        if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
203
172
        touch stamps/plugin.stamp
204
173
 
205
174
clean-plugin: $(ICEDTEAPLUGIN_CLEAN)
206
 
        rm -rf $(PLUGIN_DIR)/launcher
207
175
        rm -f stamps/plugin.stamp
208
176
 
209
177
liveconnect-source-files.txt:
280
248
        rm -f netx-source-files.txt
281
249
        rm -f stamps/netx.stamp
282
250
 
 
251
clean-desktop-files:
 
252
        rm -f javaws.desktop
 
253
 
283
254
# extras -- used to create about.jar for javaws.
284
255
extra-source-files.txt:
285
256
        find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
308
279
 
309
280
$(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
310
281
        mkdir -p launcher
311
 
        $(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
 
282
        $(CC) $(NETX_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
 
283
 
 
284
javaws.desktop: javaws.desktop.in
 
285
        sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < $(srcdir)/javaws.desktop.in > javaws.desktop
312
286
 
313
287
# plugin tests
314
288