← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openjdk-6b18/karmic-updates

« back to all changes in this revision

Viewing changes to Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-09-07 22:16:41 UTC
  • Revision ID: james.westby@ubuntu.com-20100907221641-gilxobgxpaprajd4
Tags: 6b18-1.8.1-2ubuntu1
* Build as separate source, just for armel.
* Merge the -lib package into the -jre-headless package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.in
65
65
@ENABLE_NSS_FALSE@am__append_11 = patches/icedtea-nss-not-enabled-config.patch
66
66
@WITH_ALT_HSBUILD_TRUE@am__append_12 = patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
67
67
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/zero.patch \
68
 
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/shark.patch
 
68
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/shark.patch \
 
69
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/6951319-sparc_build_fixes.patch
69
70
 
70
71
@WITH_ALT_HSBUILD_FALSE@am__append_13 = patches/hotspot/original/icedtea-6778662-lib64.patch \
71
72
@WITH_ALT_HSBUILD_FALSE@        patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
73
74
@WITH_ALT_HSBUILD_FALSE@        patches/hotspot/original/icedtea-6793825-includedb.patch \
74
75
@WITH_ALT_HSBUILD_FALSE@        patches/openjdk/6822370-reentrantreadwritelock.patch
75
76
 
76
 
@DTDTYPE_QNAME_TRUE@am__append_14 = \
 
77
@HAS_PAX_TRUE@am__append_14 = patches/no-test_gamma.patch
 
78
@DTDTYPE_QNAME_TRUE@am__append_15 = \
77
79
@DTDTYPE_QNAME_TRUE@    patches/ecj/icedtea-jaxws-getdtdtype.patch
78
80
 
79
 
@WITH_CACAO_TRUE@am__append_15 = \
 
81
@HAS_PAX_FALSE@am__append_16 = patches/ecj/no-test_gamma.patch
 
82
@WITH_CACAO_TRUE@am__append_17 = \
80
83
@WITH_CACAO_TRUE@       ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
81
84
 
82
 
@DISABLE_OPTIMIZATIONS_TRUE@am__append_16 = \
 
85
@DISABLE_OPTIMIZATIONS_TRUE@am__append_18 = \
83
86
@DISABLE_OPTIMIZATIONS_TRUE@    NO_OPTIMIZATIONS="true" \
84
87
@DISABLE_OPTIMIZATIONS_TRUE@    CC_NO_OPT="-O0 -g"
85
88
 
86
 
@ENABLE_DOCS_FALSE@am__append_17 = \
 
89
@ENABLE_DOCS_FALSE@am__append_19 = \
87
90
@ENABLE_DOCS_FALSE@     NO_DOCS="true"
88
91
 
89
 
@ENABLE_CROSS_COMPILATION_TRUE@am__append_18 = \
 
92
@ENABLE_CROSS_COMPILATION_TRUE@am__append_20 = \
90
93
@ENABLE_CROSS_COMPILATION_TRUE@ CROSS_COMPILATION="true" \
91
94
@ENABLE_CROSS_COMPILATION_TRUE@ CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)"
92
95
 
93
 
@USE_ALT_JAR_TRUE@am__append_19 = \
 
96
@USE_ALT_JAR_TRUE@am__append_21 = \
94
97
@USE_ALT_JAR_TRUE@      ALT_JAR_CMD="$(ALT_JAR_CMD)"
95
98
 
96
 
@HAS_HOTSPOT_REVISION_TRUE@am__append_20 = \
 
99
@HAS_HOTSPOT_REVISION_TRUE@am__append_22 = \
97
100
@HAS_HOTSPOT_REVISION_TRUE@     HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)" 
98
101
 
99
 
@WITH_RHINO_TRUE@am__append_21 = \
 
102
@WITH_RHINO_TRUE@am__append_23 = \
100
103
@WITH_RHINO_TRUE@       RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
101
104
 
102
 
@ADD_SHARK_BUILD_TRUE@am__append_22 = \
 
105
@ADD_SHARK_BUILD_TRUE@am__append_24 = \
103
106
@ADD_SHARK_BUILD_TRUE@  --enable-shark
104
107
 
105
 
@WITH_ALT_HSBUILD_TRUE@am__append_23 = \
 
108
@WITH_ALT_HSBUILD_TRUE@am__append_25 = \
106
109
@WITH_ALT_HSBUILD_TRUE@ $(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
107
110
@WITH_ALT_HSBUILD_TRUE@   --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
108
111
 
270
273
PATH_SEPARATOR = @PATH_SEPARATOR@
271
274
PKGVERSION = @PKGVERSION@
272
275
PKG_CONFIG = @PKG_CONFIG@
 
276
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
277
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
273
278
RHINO_JAR = @RHINO_JAR@
274
279
RMIC = @RMIC@
275
280
SET_MAKE = @SET_MAKE@
635
640
        patches/ant-1.8.0.patch patches/icedtea-nss-6763530.patch \
636
641
        patches/nss-debug.patch \
637
642
        patches/icedtea-override-redirect-metacity.patch \
638
 
        patches/openjdk/6678385.patch $(am__append_1) $(am__append_2) \
639
 
        $(am__append_3) $(am__append_4) $(am__append_5) \
640
 
        $(am__append_6) $(am__append_7) $(am__append_8) \
641
 
        $(am__append_9) $(am__append_10) $(am__append_11) \
642
 
        $(am__append_12) $(am__append_13) $(DISTRIBUTION_PATCHES)
 
643
        patches/openjdk/6678385.patch patches/fonts-gentoo.patch \
 
644
        patches/fonts-rhel.patch patches/icedtea-too-many-args.patch \
 
645
        $(am__append_1) $(am__append_2) $(am__append_3) \
 
646
        $(am__append_4) $(am__append_5) $(am__append_6) \
 
647
        $(am__append_7) $(am__append_8) $(am__append_9) \
 
648
        $(am__append_10) $(am__append_11) $(am__append_12) \
 
649
        $(am__append_13) $(am__append_14) $(DISTRIBUTION_PATCHES)
643
650
 
644
651
# match against $(abs_top_srcdir) and then remove it again,
645
652
# because stamps/patch.stamp target will also add it
652
659
        patches/ecj/icedtea-spp.patch patches/ecj/icedtea-jopt.patch \
653
660
        patches/ecj/icedtea-jaxp-dependency.patch \
654
661
        patches/ecj/bootver.patch patches/ecj/getannotation-cast.patch \
655
 
        patches/ecj/override.patch $(am__append_14) \
656
 
        $(DISTRIBUTION_ECJ_PATCHES)
 
662
        patches/ecj/override.patch $(am__append_15) \
 
663
        $(DISTRIBUTION_ECJ_PATCHES) $(am__append_16)
657
664
@ZERO_BUILD_FALSE@ICEDTEA_ZERO_BUILD = 
658
665
 
659
666
# OpenJDK build environment.
700
707
        ALT_DROPS_DIR="$(abs_top_builddir)/drops" VERBOSE="$(VERBOSE)" \
701
708
        ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
702
709
        ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \
703
 
        $(am__append_15) $(am__append_16) $(am__append_17) \
704
 
        $(am__append_18) $(am__append_19) $(am__append_20) \
705
 
        $(am__append_21)
 
710
        $(am__append_17) $(am__append_18) $(am__append_19) \
 
711
        $(am__append_20) $(am__append_21) $(am__append_22) \
 
712
        $(am__append_23)
706
713
 
707
714
# OpenJDK ecj build environment.
708
715
ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
763
770
@ENABLE_PLUGIN_TRUE@            IcedTeaPluginUtils.o
764
771
 
765
772
ADD_ZERO_CONFIGURE_ARGS = --with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
766
 
        --enable-zero $(am__append_22) --disable-docs $(filter-out \
 
773
        --enable-zero $(am__append_24) --disable-docs $(filter-out \
767
774
        '--with-gcj-home=% '--with-ecj=% '--with-java=% \
768
775
        '--with-javah=% '--with-rmic=% '--with-additional-vms=% \
 
776
        '--with-hotspot-build=% '--with-hotspot-src-zip=% \
769
777
        '--with-openjdk '--with-openjdk=% , $(CONFIGURE_ARGS)) $(if \
770
778
        $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \
771
779
        --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \
772
 
        $(am__append_23)
 
780
        $(am__append_25)
773
781
ADD_ZERO_EXTRA_BUILD_ENV = \
774
782
        BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \
775
783
        BUILD_JAXP=false      ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \
776
784
        BUILD_JAXWS=false     ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \
777
785
        BUILD_CORBA=false     ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \
778
786
        BUILD_JDK=false \
779
 
        DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))'
 
787
        DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(subst -hs17,-original,$(p))))'
780
788
 
781
789
 
782
790
# FIXME: this might need some adjustment for other OS than Linux