[Libreoffice-commits] .: Branch 'feature/gnumake4' - 209 commits - afms/prj agg/inc agg/prj agg/source apple_remote/prj beanshell/prj cppunit/aix.patch cppunit/avoid-synthetised-destructor.patch cppunit/makefile.mk cppunit/prj cppunit/windows.patch epm/prj external/gcc3_specific external/glibc external/mingwheaders external/msi external/msvcp100 external/msvcp70 external/msvcp71 external/msvcp80 external/prj external/unicows external/vcredist .gitignore hsqldb/makefile.mk hsqldb/prj hyphen/hyphen-2.7.1.patch hyphen/makefile.mk hyphen/prj icc/makefile.mk icc/prj icc/SampleICC-1.3.2-fmtargs.patch icc/SampleICC-1.3.2.patch icc/source libegg/inc libegg/prj libegg/README libegg/source libtextcat/libtextcat-2.2.patch libtextcat/libtextcat-aix.patch libtextcat/makefile.mk libtextcat/prj libvisio/libvisio-android.patch libvisio/libvisio-mingw-cross.patch libvisio/makefile.mk libvisio/prj libwpd/libwpd-0.8.8.diff libwpd/libwpd-0.9.2.patch libwpd/makefile.mk libwpd/prj libwpg/libwpg-0.2.0.patch lib wpg/makefile.mk libwpg/prj libwps/libwps-0.2.1.patch libwps/libwps-0.2.1-warnings.patch libwps/makefile.mk libwps/prj libxmlsec/makefile.mk libxmlsec/prj libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch libxmlsec/xmlsec1-vc10.patch lpsolve/lp_solve_5.5.patch lpsolve/lp_solve-aix.patch lpsolve/makefile.mk lpsolve/prj lucene/prj mdds/makefile.mk mdds/prj Mesa/inc Mesa/prj mysqlcppconn/makefile.mk mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch mysqlcppconn/mysql-connector-cpp.patch mysqlcppconn/prj mythes/makefile.mk mythes/mythes-1.2.0-android.patch mythes/mythes-1.2.1-rhbz675806.patch mythes/prj np_sdk/mozsrc np_sdk/prj openssl/makefile.mk openssl/opensslios.patch openssl/openssl.patch openssl/prj redland/prj redland/raptor redland/rasqal redland/redland rhino/makefile.mk rhino/prj rhino/README sane/prj translate_toolkit/makefile.mk translate_toolkit/prj translate_toolkit/translate-toolkit-1.8.1-skipsource.p atch twain/prj unixODBC/inc unixODBC/prj vigra/prj x11_extensions/inc x11_extensions/prj xsltml/prj
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Wed Jun 22 10:22:58 PDT 2011
.gitignore | 26
Mesa/inc/gl.h | 2252 ++
Mesa/inc/gl_mangle.h | 1568 +
Mesa/inc/glext.h | 7271 +++++++
Mesa/inc/glu.h | 348
Mesa/inc/glu_mangle.h | 86
Mesa/inc/glx.h | 500
Mesa/inc/glx_mangle.h | 81
Mesa/inc/glxext.h | 785
Mesa/inc/vms_x_fix.h | 1224 +
Mesa/prj/build.lst | 3
Mesa/prj/d.lst | 3
afms/prj/d.lst | 4
agg/inc/agg_alpha_mask_u8.h | 499
agg/inc/agg_arc.h | 74
agg/inc/agg_array.h | 887
agg/inc/agg_arrowhead.h | 82
agg/inc/agg_basics.h | 343
agg/inc/agg_bezier_arc.h | 158
agg/inc/agg_bitset_iterator.h | 54
agg/inc/agg_bounding_rect.h | 116
agg/inc/agg_bspline.h | 77
agg/inc/agg_clip_liang_barsky.h | 209
agg/inc/agg_color_gray.h | 364
agg/inc/agg_color_rgba.h | 618
agg/inc/agg_config.h | 31
agg/inc/agg_conv_adaptor_vcgen.h | 169
agg/inc/agg_conv_adaptor_vpgen.h | 166
agg/inc/agg_conv_bspline.h | 48
agg/inc/agg_conv_clip_polygon.h | 69
agg/inc/agg_conv_clip_polyline.h | 69
agg/inc/agg_conv_close_polygon.h | 132
agg/inc/agg_conv_concat.h | 80
agg/inc/agg_conv_contour.h | 65
agg/inc/agg_conv_curve.h | 174
agg/inc/agg_conv_dash.h | 68
agg/inc/agg_conv_gpc.h | 443
agg/inc/agg_conv_marker.h | 154
agg/inc/agg_conv_marker_adaptor.h | 51
agg/inc/agg_conv_segmentator.h | 48
agg/inc/agg_conv_shorten_path.h | 50
agg/inc/agg_conv_smooth_poly1.h | 80
agg/inc/agg_conv_stroke.h | 73
agg/inc/agg_conv_transform.h | 75
agg/inc/agg_conv_unclose_polygon.h | 59
agg/inc/agg_curves.h | 150
agg/inc/agg_dda_line.h | 290
agg/inc/agg_ellipse.h | 98
agg/inc/agg_ellipse_bresenham.h | 113
agg/inc/agg_embedded_raster_fonts.h | 59
agg/inc/agg_font_cache_manager.h | 397
agg/inc/agg_gamma_functions.h | 123
agg/inc/agg_gamma_lut.h | 114
agg/inc/agg_glyph_raster_bin.h | 155
agg/inc/agg_gsv_text.h | 154
agg/inc/agg_image_filters.h | 449
agg/inc/agg_line_aa_basics.h | 152
agg/inc/agg_math.h | 247
agg/inc/agg_math_stroke.h | 340
agg/inc/agg_path_storage.h | 364
agg/inc/agg_path_storage_integer.h | 300
agg/inc/agg_pattern_filters_rgba.h | 122
agg/inc/agg_pixfmt_amask_adaptor.h | 265
agg/inc/agg_pixfmt_gray.h | 703
agg/inc/agg_pixfmt_rgb.h | 760
agg/inc/agg_pixfmt_rgb_packed.h | 1277 -
agg/inc/agg_pixfmt_rgba.h | 1312 -
agg/inc/agg_rasterizer_outline.h | 146
agg/inc/agg_rasterizer_outline_aa.h | 516
agg/inc/agg_rasterizer_scanline_aa.h | 743
agg/inc/agg_render_scanlines.h | 66
agg/inc/agg_renderer_base.h | 618
agg/inc/agg_renderer_markers.h | 707
agg/inc/agg_renderer_mclip.h | 383
agg/inc/agg_renderer_outline_aa.h | 1545 -
agg/inc/agg_renderer_outline_image.h | 924
agg/inc/agg_renderer_primitives.h | 224
agg/inc/agg_renderer_raster_text.h | 264
agg/inc/agg_renderer_scanline.h | 450
agg/inc/agg_rendering_buffer.h | 179
agg/inc/agg_rendering_buffer_dynarow.h | 184
agg/inc/agg_rounded_rect.h | 79
agg/inc/agg_scanline_bin.h | 171
agg/inc/agg_scanline_boolean_algebra.h | 1559 -
agg/inc/agg_scanline_p.h | 197
agg/inc/agg_scanline_storage_aa.h | 796
agg/inc/agg_scanline_storage_bin.h | 569
agg/inc/agg_scanline_u.h | 323
agg/inc/agg_shorten_path.h | 66
agg/inc/agg_simul_eq.h | 147
agg/inc/agg_span_allocator.h | 72
agg/inc/agg_span_converter.h | 53
agg/inc/agg_span_generator.h | 50
agg/inc/agg_span_gouraud.h | 180
agg/inc/agg_span_gouraud_gray.h | 185
agg/inc/agg_span_gouraud_rgba.h | 206
agg/inc/agg_span_gradient.h | 422
agg/inc/agg_span_gradient_alpha.h | 123
agg/inc/agg_span_image_filter.h | 110
agg/inc/agg_span_image_filter_gray.h | 701
agg/inc/agg_span_image_filter_rgb.h | 840
agg/inc/agg_span_image_filter_rgba.h | 864
agg/inc/agg_span_image_resample.h | 180
agg/inc/agg_span_image_resample_gray.h | 359
agg/inc/agg_span_image_resample_rgb.h | 393
agg/inc/agg_span_image_resample_rgba.h | 393
agg/inc/agg_span_interpolator_adaptor.h | 77
agg/inc/agg_span_interpolator_linear.h | 232
agg/inc/agg_span_interpolator_persp.h | 462
agg/inc/agg_span_interpolator_trans.h | 97
agg/inc/agg_span_pattern.h | 278
agg/inc/agg_span_pattern_filter_gray.h | 472
agg/inc/agg_span_pattern_filter_rgb.h | 568
agg/inc/agg_span_pattern_filter_rgba.h | 584
agg/inc/agg_span_pattern_resample_gray.h | 320
agg/inc/agg_span_pattern_resample_rgb.h | 346
agg/inc/agg_span_pattern_resample_rgba.h | 354
agg/inc/agg_span_pattern_rgb.h | 165
agg/inc/agg_span_pattern_rgba.h | 111
agg/inc/agg_span_solid.h | 63
agg/inc/agg_span_subdiv_adaptor.h | 141
agg/inc/agg_trans_affine.h | 344
agg/inc/agg_trans_bilinear.h | 166
agg/inc/agg_trans_double_path.h | 131
agg/inc/agg_trans_lens.h | 79
agg/inc/agg_trans_perspective.h | 192
agg/inc/agg_trans_single_path.h | 97
agg/inc/agg_trans_viewport.h | 304
agg/inc/agg_trans_warp_magnifier.h | 51
agg/inc/agg_vcgen_bspline.h | 74
agg/inc/agg_vcgen_contour.h | 96
agg/inc/agg_vcgen_dash.h | 99
agg/inc/agg_vcgen_markers_term.h | 72
agg/inc/agg_vcgen_smooth_poly1.h | 87
agg/inc/agg_vcgen_stroke.h | 114
agg/inc/agg_vcgen_vertex_sequence.h | 135
agg/inc/agg_vertex_iterator.h | 133
agg/inc/agg_vertex_sequence.h | 176
agg/inc/agg_vpgen_clip_polygon.h | 83
agg/inc/agg_vpgen_clip_polyline.h | 121
agg/inc/agg_vpgen_segmentator.h | 61
agg/prj/build.lst | 5
agg/prj/d.lst | 11
agg/source/agg.flt | 3
agg/source/agg_arc.cpp | 105
agg/source/agg_arrowhead.cpp | 110
agg/source/agg_bezier_arc.cpp | 237
agg/source/agg_bspline.cpp | 299
agg/source/agg_curves.cpp | 246
agg/source/agg_embedded_raster_fonts.cpp |10426 -----------
agg/source/agg_gsv_text.cpp | 688
agg/source/agg_image_filters.cpp | 120
agg/source/agg_line_aa_basics.cpp | 82
agg/source/agg_line_profile_aa.cpp | 117
agg/source/agg_path_storage.cpp | 525
agg/source/agg_rasterizer_scanline_aa.cpp | 621
agg/source/agg_rounded_rect.cpp | 164
agg/source/agg_sqrt_tables.cpp | 115
agg/source/agg_trans_affine.cpp | 195
agg/source/agg_trans_double_path.cpp | 273
agg/source/agg_trans_single_path.cpp | 202
agg/source/agg_trans_warp_magnifier.cpp | 50
agg/source/agg_vcgen_bspline.cpp | 194
agg/source/agg_vcgen_contour.cpp | 191
agg/source/agg_vcgen_dash.cpp | 237
agg/source/agg_vcgen_markers_term.cpp | 103
agg/source/agg_vcgen_smooth_poly1.cpp | 226
agg/source/agg_vcgen_stroke.cpp | 246
agg/source/agg_vpgen_clip_polygon.cpp | 133
agg/source/agg_vpgen_clip_polyline.cpp | 142
agg/source/agg_vpgen_segmentator.cpp | 67
agg/source/makefile.mk | 91
apple_remote/prj/d.lst | 6
beanshell/prj/d.lst | 2
cppunit/aix.patch | 21
cppunit/avoid-synthetised-destructor.patch | 29
cppunit/makefile.mk | 95
cppunit/prj/build.lst | 2
cppunit/prj/d.lst | 56
cppunit/windows.patch | 42
epm/prj/d.lst | 6
external/gcc3_specific/makefile.mk | 22
external/glibc/makefile.mk | 1
external/mingwheaders/makefile.mk | 6
external/msi/readme.txt | 4
external/msvcp100/README_msvcX100.dll | 2
external/msvcp70/README_msvcp70.dll | 4
external/msvcp71/README_msvcX71.dll | 6
external/msvcp80/README_msvcX80.dll | 5
external/prj/d.lst | 86
external/unicows/README_unicows.dll | 1
external/vcredist/README_vcredistX.exe | 2
hsqldb/makefile.mk | 2
hsqldb/prj/d.lst | 2
hyphen/hyphen-2.7.1.patch | 11
hyphen/makefile.mk | 14
hyphen/prj/d.lst | 8
icc/SampleICC-1.3.2-fmtargs.patch | 20
icc/SampleICC-1.3.2.patch | 24
icc/makefile.mk | 13
icc/prj/build.lst | 2
icc/prj/d.lst | 6
icc/source/create_sRGB_profile/create_sRGB_profile.cpp | 4
libegg/README | 7
libegg/inc/eggtrayicon.h | 35
libegg/prj/build.lst | 2
libegg/prj/d.lst | 5
libegg/source/eggtrayicon-impl.h | 76
libegg/source/eggtrayicon.c | 573
libegg/source/makefile.mk | 66
libtextcat/libtextcat-2.2.patch | 26
libtextcat/libtextcat-aix.patch | 86
libtextcat/makefile.mk | 26
libtextcat/prj/build.lst | 2
libtextcat/prj/d.lst | 14
libvisio/libvisio-android.patch | 14
libvisio/libvisio-mingw-cross.patch | 11
libvisio/makefile.mk | 71
libvisio/prj/build.lst | 3
libvisio/prj/d.lst | 5
libwpd/libwpd-0.8.8.diff | 908
libwpd/libwpd-0.9.2.patch | 14
libwpd/makefile.mk | 10
libwpd/prj/build.lst | 2
libwpd/prj/d.lst | 27
libwpg/libwpg-0.2.0.patch | 14
libwpg/makefile.mk | 65
libwpg/prj/build.lst | 3
libwpg/prj/d.lst | 6
libwps/libwps-0.2.1-warnings.patch | 60
libwps/libwps-0.2.1.patch | 28
libwps/makefile.mk | 61
libwps/prj/build.lst | 3
libwps/prj/d.lst | 5
libxmlsec/makefile.mk | 11
libxmlsec/prj/build.lst | 2
libxmlsec/prj/d.lst | 18
libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch | 23
libxmlsec/xmlsec1-vc10.patch | 15
lpsolve/lp_solve-aix.patch | 39
lpsolve/lp_solve_5.5.patch | 85
lpsolve/makefile.mk | 22
lpsolve/prj/d.lst | 15
lucene/prj/d.lst | 6
mdds/makefile.mk | 6
mdds/prj/d.lst | 6
mysqlcppconn/makefile.mk | 15
mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch | 6
mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch | 6
mysqlcppconn/mysql-connector-cpp.patch | 6
mysqlcppconn/prj/d.lst | 22
mythes/makefile.mk | 18
mythes/mythes-1.2.0-android.patch | 11
mythes/mythes-1.2.1-rhbz675806.patch | 10
mythes/prj/d.lst | 10
np_sdk/mozsrc/jri_md.h | 39
np_sdk/mozsrc/jritypes.h | 12
np_sdk/mozsrc/makefile.mk | 5
np_sdk/mozsrc/npapi.h | 27
np_sdk/mozsrc/npupp.h | 31
np_sdk/mozsrc/npwin.cpp | 6
np_sdk/prj/build.lst | 2
np_sdk/prj/d.lst | 10
openssl/makefile.mk | 19
openssl/openssl.patch | 23
openssl/opensslios.patch | 12
openssl/prj/d.lst | 20
redland/prj/build.lst | 2
redland/prj/d.lst | 38
redland/raptor/makefile.mk | 44
redland/raptor/raptor-1.4.18.libxml.patch | 117
redland/raptor/raptor-1.4.18.libxslt.patch | 116
redland/raptor/raptor-1.4.18.patch.autotools | 11
redland/raptor/raptor-1.4.18.patch.cross | 35
redland/raptor/raptor-aix.patch | 21
redland/rasqal/makefile.mk | 29
redland/rasqal/rasqal-0.9.16.patch.autotools | 11
redland/rasqal/rasqal-aix.patch | 44
redland/redland/makefile.mk | 28
redland/redland/redland-1.0.8.patch.autotools | 11
redland/redland/redland-aix.patch | 21
rhino/makefile.mk | 8
rhino/prj/d.lst | 2
sane/prj/d.lst | 6
translate_toolkit/makefile.mk | 80
translate_toolkit/prj/build.lst | 3
translate_toolkit/prj/d.lst | 35
translate_toolkit/translate-toolkit-1.8.1-skipsource.patch | 99
twain/prj/d.lst | 6
unixODBC/inc/sqlext.h | 2
unixODBC/inc/sqltypes.h | 4
unixODBC/prj/d.lst | 6
vigra/prj/d.lst | 4
x11_extensions/inc/shape.h | 155
x11_extensions/inc/shapeconst.h | 55
x11_extensions/prj/d.lst | 6
xsltml/prj/d.lst | 8
297 files changed, 16228 insertions(+), 54845 deletions(-)
New commits:
commit edcf1e43713c5390cc9324709810bde65a8ae3c8
Merge: a98ef12... 11eb56d...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 22 18:49:45 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 11eb56d47823130dad4e334df9eaffbc7876093e
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 13 02:06:08 2011 +0300
Enable building openssl for iOS
Wasn't that complicated after all.
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 21a8dc7..1b789b3 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -110,6 +110,12 @@ UNAME=$(shell uname)
.ENDIF
.ENDIF
+.IF "$(OS)" == "IOS"
+ PATCH_FILES=opensslios.patch
+ CONFIGURE_ACTION=Configure ios-armv7
+ CONFIGURE_FLAGS=no-shared no-idea
+.ENDIF
+
.IF "$(OS)" == "WNT"
.IF "$(COM)"=="GCC"
diff --git a/openssl/opensslios.patch b/openssl/opensslios.patch
new file mode 100644
index 0000000..48166e8
--- /dev/null
+++ b/openssl/opensslios.patch
@@ -0,0 +1,12 @@
+--- misc/openssl-0.9.8o/Configure
++++ misc/build/openssl-0.9.8o/Configure
+@@ -530,6 +530,9 @@
+ "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+
++##### iOS
++"ios-armv7","gcc:-arch armv7 -O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::",
++
+ ##### A/UX
+ "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
+
commit a9b3b005c345590dbba5a852a5aa53ec8c3afd46
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 11 21:42:37 2011 +0300
Add Android patch
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 563c756..abd7038 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -44,7 +44,8 @@ ADDITIONAL_FILES += makefile.mk
PATCH_FILES=\
mythes-1.2.0-vanilla-th-gen-idx.patch \
mythes-1.2.0-makefile-mk.diff \
- mythes-1.2.1-rhbz675806.patch
+ mythes-1.2.1-rhbz675806.patch \
+ mythes-1.2.0-android.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
diff --git a/mythes/mythes-1.2.0-android.patch b/mythes/mythes-1.2.0-android.patch
new file mode 100644
index 0000000..cb34b12
--- /dev/null
+++ b/mythes/mythes-1.2.0-android.patch
@@ -0,0 +1,11 @@
+--- misc/build/mythes-1.2.0/config.sub
++++ misc/build/mythes-1.2.0/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
commit c7a79f53c335e297afb522422b2c1b1bd3fe0039
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 10 00:34:18 2011 +0300
Need a small patch for Android
diff --git a/libvisio/libvisio-android.patch b/libvisio/libvisio-android.patch
new file mode 100644
index 0000000..b547913
--- /dev/null
+++ b/libvisio/libvisio-android.patch
@@ -0,0 +1,14 @@
+--- misc/build/libvisio-0.0.0/src/lib/VSDSVGGenerator.cpp
++++ misc/build/libvisio-0.0.0/src/lib/VSDSVGGenerator.cpp
+@@ -33,7 +33,11 @@
+ {
+ std::ostringstream tempStream;
+ tempStream << value;
++#ifndef __ANDROID__
+ std::string decimalPoint(localeconv()->decimal_point);
++#else
++ std::string decimalPoint(".");
++#endif
+ if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+ return tempStream.str();
+ std::string stringValue(tempStream.str());
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 33708ba..7f2cbf3 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -58,7 +58,8 @@ TARFILE_NAME=libvisio-0.0.0
TARFILE_MD5=763bb9b14eec5ba9a533d7a9279301db
PATCH_FILES=\
- libvisio-mingw-cross.patch
+ libvisio-mingw-cross.patch \
+ libvisio-android.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
commit b19fa8c1a642f9fce9e6dcb9f07ed4aa176672d6
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 10 00:30:50 2011 +0300
Need a small patch for Android
diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch
new file mode 100644
index 0000000..86567b1
--- /dev/null
+++ b/libwpg/libwpg-0.2.0.patch
@@ -0,0 +1,14 @@
+--- misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
++++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
+@@ -30,7 +30,11 @@
+ {
+ std::ostringstream tempStream;
+ tempStream << value;
++#ifndef __ANDROID__
+ std::string decimalPoint(localeconv()->decimal_point);
++#else
++ std::string decimalPoint(".");
++#endif
+ if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+ return tempStream.str();
+ std::string stringValue(tempStream.str());
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index 0fa701f..44eccce 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -51,6 +51,10 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
TARFILE_NAME=libwpg-0.2.0
TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
+
+PATCH_FILES=$(TARFILE_NAME).patch
+
+
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
commit 2b04f15213f83b3e7ff5d6cb9f8b0c4a4f053eb9
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 10 00:22:07 2011 +0300
Need a small patch for Android
diff --git a/libwpd/libwpd-0.9.2.patch b/libwpd/libwpd-0.9.2.patch
new file mode 100644
index 0000000..2fc7074
--- /dev/null
+++ b/libwpd/libwpd-0.9.2.patch
@@ -0,0 +1,14 @@
+--- misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
++++ misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
+@@ -1229,7 +1229,11 @@
+ tempString.sprintf("0.0000");
+ else
+ tempString.sprintf("%.4f", value);
++#ifndef __ANDROID__
+ std::string decimalPoint(localeconv()->decimal_point);
++#else
++ std::string decimalPoint(".");
++#endif
+ if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+ return tempString;
+ std::string stringValue(tempString.cstr());
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index a8b17ff..8761bbb 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -43,6 +43,9 @@ TARGET=wpd
TARFILE_NAME=libwpd-0.9.2
TARFILE_MD5=8d265a592619166f29c4672ea54812b7
+
+PATCH_FILES=$(TARFILE_NAME).patch
+
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
commit a63802105e2df2c57c7bdad0ea6d5fd6e5a14a9a
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 9 23:26:36 2011 +0300
First attempt at Android support
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 3b6f696..50cc9ee 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -159,7 +159,7 @@ OUT2INC+=src$/raptor.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=src$/.libs$/libraptor.a
OUT2BIN+=src/raptor-config
.ELIF "$(OS)"=="AIX"
diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools
index 4b43def..ed9e6bd 100644
--- a/redland/raptor/raptor-1.4.18.patch.autotools
+++ b/redland/raptor/raptor-1.4.18.patch.autotools
@@ -1,3 +1,14 @@
+--- misc/raptor-1.4.18/config.sub
++++ misc/build/raptor-1.4.18/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/raptor-1.4.18/configure Sun Jun 15 10:25:55 2008
+++ misc/build/raptor-1.4.18/configure Wed Feb 18 13:23:12 2009
@@ -4321,7 +4321,7 @@
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index dbad2d2..ce3a6cf 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -144,7 +144,7 @@ OUT2INC+=src$/rasqal.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=src$/.libs$/librasqal.a
OUT2BIN+=src/rasqal-config
.ELIF "$(OS)"=="WNT"
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools
index 100499d..19b8792 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.autotools
+++ b/redland/rasqal/rasqal-0.9.16.patch.autotools
@@ -1,3 +1,14 @@
+--- misc/rasqal-0.9.16/config.sub
++++ misc/build/rasqal-0.9.16/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/rasqal-0.9.16/ltmain.sh Tue Apr 29 23:33:55 2008
+++ misc/build/rasqal-0.9.16/ltmain.sh Wed Feb 18 13:25:00 2009
@@ -1565,6 +1565,11 @@
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index b38c45a..4bed69e 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -147,7 +147,7 @@ OUT2INC+=librdf$/*.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=librdf$/.libs$/librdf.a
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools
index 5b29d0b..2bd2085 100644
--- a/redland/redland/redland-1.0.8.patch.autotools
+++ b/redland/redland/redland-1.0.8.patch.autotools
@@ -1,3 +1,14 @@
+--- misc/redland-1.0.8/config.sub
++++ misc/build/redland-1.0.8/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008
+++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009
@@ -4671,7 +4671,7 @@
commit b7e46a0b334f9c58ef291b4a29030192fc66673c
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 9 23:26:23 2011 +0300
First attempt at Android support
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index aff765f..21a8dc7 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -64,7 +64,7 @@ OUT2INC += include/openssl/*
UNAME=$(shell uname)
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8o.map \
commit 914d535bd09d541dc1c4f499c4787535c7efdc3b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 9 19:43:02 2011 +0300
Cross-compilation support for Android
diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch
index 0e8eafa..f444955 100644
--- a/hyphen/hyphen-2.7.1.patch
+++ b/hyphen/hyphen-2.7.1.patch
@@ -1,3 +1,14 @@
+--- misc/hyphen-2.7.1/config.sub
++++ misc/build/hyphen-2.7.1/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/hyphen-2.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200
+++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100
@@ -25,14 +25,13 @@
commit 85c652dee43b2ad2453d9ed8ccf81a5efbc8cb94
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 9 19:10:07 2011 +0300
Don't do this for Android either
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 53765c9..d40468c 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -48,12 +48,7 @@ $(MINGWGXXDLL) :
.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
-.IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="IOS"
-.IF "$(OS)"!="FREEBSD"
-.IF "$(OS)"!="NETBSD"
-.IF "$(OS)"!="OPENBSD"
-.IF "$(OS)"!="DRAGONFLY"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
.EXPORT : CC
@@ -80,11 +75,6 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
.ENDIF
.ENDIF
commit bcd7b3730e989e54c97fd91fbd416dbb49d00fcd
Author: William Lachance <wrlach at gmail.com>
Date: Wed Jun 8 16:48:53 2011 +0200
Fix raptor to not use xml2-config on Mac
Christian suggested modifying the configure script not to use
xml2-config/xslt-config at all. Here's a patch which does exactly
that. I'm not exactly thrilled by the size/complexity of this patch
for what it does, but at the same time it does seem a bit crazy for
LO not to build just because libxml is installed in MacPorts (which
is not uncommon: it's a dependency of ImageMagick for instance).
diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch
index d5627cd..59e5ceb 100644
--- a/redland/raptor/raptor-1.4.18.libxml.patch
+++ b/redland/raptor/raptor-1.4.18.libxml.patch
@@ -1,6 +1,110 @@
---- misc/raptor-1.4.18/configure 2011-06-04 01:25:04.000000000 +0200
-+++ misc/build/raptor-1.4.18/configure 2011-06-04 01:24:57.000000000 +0200
-@@ -26447,8 +26447,8 @@
+--- misc/raptor-1.4.18/configure 2011-06-05 11:55:18.000000000 -0400
++++ misc/build/raptor-1.4.18/configure 2011-06-05 11:55:46.000000000 -0400
+@@ -23470,73 +23470,6 @@
+ LIBS="$oLIBS"
+
+
+-# Check whether --with-xml2-config was given.
+-if test "${with_xml2_config+set}" = set; then
+- withval=$with_xml2_config; xml2_config="$withval"
+-else
+- xml2_config=""
+-fi
+-
+-
+-if test "X$xml2_config" != "X" ; then
+- { echo "$as_me:$LINENO: checking for $xml2_config" >&5
+-echo $ECHO_N "checking for $xml2_config... $ECHO_C" >&6; }
+-
+- if test -f $xml2_config ; then
+- XML_CONFIG=$xml2_config
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- else
+- { echo "$as_me:$LINENO: result: no - searching PATH" >&5
+-echo "${ECHO_T}no - searching PATH" >&6; }
+- fi
+-fi
+-if test "X$XML_CONFIG" = "X"; then
+- for ac_prog in xml2-config
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_XML_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$XML_CONFIG"; then
+- ac_cv_prog_XML_CONFIG="$XML_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_XML_CONFIG="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-XML_CONFIG=$ac_cv_prog_XML_CONFIG
+-if test -n "$XML_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
+-echo "${ECHO_T}$XML_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- test -n "$XML_CONFIG" && break
+-done
+-
+-fi
+-
+-
+ # Check whether --with-xslt-config was given.
+ if test "${with_xslt_config+set}" = set; then
+ withval=$with_xslt_config; xslt_config="$withval"
+@@ -23719,8 +23652,8 @@
+
+ oCPPFLAGS="$CPPFLAGS"
+ oLIBS="$LIBS"
+-if test "X$XML_CONFIG" != X; then
+- LIBS="$LIBS `$XML_CONFIG --libs`"
++if test 0; then
++ LIBS="$LIBS $LIBXML_LIBS"
+ { echo "$as_me:$LINENO: checking for xmlCreatePushParserCtxt" >&5
+ echo $ECHO_N "checking for xmlCreatePushParserCtxt... $ECHO_C" >&6; }
+ if test "${ac_cv_func_xmlCreatePushParserCtxt+set}" = set; then
+@@ -23813,18 +23746,6 @@
+ if test $have_xmlCreatePushParserCtxt = yes; then
+ have_libxml_lib=1
+ have_libxml=1
+- CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
+- LIBXML_VERSION=`$XML_CONFIG --version`
+- libxml_version_dec=`echo $LIBXML_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+- libxml_min_version_dec=`echo $libxml_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+- { echo "$as_me:$LINENO: result: yes - version $LIBXML_VERSION" >&5
+-echo "${ECHO_T}yes - version $LIBXML_VERSION" >&6; }
+- if test $libxml_version_dec -lt $libxml_min_version_dec; then
+- { echo "$as_me:$LINENO: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&5
+-echo "$as_me: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&2;}
+- have_libxml_lib=0
+- have_libxml=0
+- fi
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -26447,8 +26368,8 @@
CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
LIBS="$LIBS -Llibxml -llibxml"
else
diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch
index 488aa48..6dfffd9 100644
--- a/redland/raptor/raptor-1.4.18.libxslt.patch
+++ b/redland/raptor/raptor-1.4.18.libxslt.patch
@@ -1,6 +1,109 @@
---- misc/raptor-1.4.18/configure 2011-06-04 01:34:34.000000000 +0200
-+++ misc/build/raptor-1.4.18/configure 2011-06-04 01:34:08.000000000 +0200
-@@ -26474,8 +26474,8 @@
+--- misc/raptor-1.4.18/configure 2011-06-05 11:57:41.000000000 -0400
++++ misc/build/raptor-1.4.18/configure 2011-06-05 11:58:11.000000000 -0400
+@@ -23470,73 +23470,6 @@
+ LIBS="$oLIBS"
+
+
+-# Check whether --with-xslt-config was given.
+-if test "${with_xslt_config+set}" = set; then
+- withval=$with_xslt_config; xslt_config="$withval"
+-else
+- xslt_config=""
+-fi
+-
+-
+-if test "X$xslt_config" != "X" ; then
+- { echo "$as_me:$LINENO: checking for $xslt_config" >&5
+-echo $ECHO_N "checking for $xslt_config... $ECHO_C" >&6; }
+-
+- if test -f $xslt_config ; then
+- XSLT_CONFIG=$xslt_config
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- else
+- { echo "$as_me:$LINENO: result: no - searching PATH" >&5
+-echo "${ECHO_T}no - searching PATH" >&6; }
+- fi
+-fi
+-if test "X$XSLT_CONFIG" = "X"; then
+- for ac_prog in xslt-config
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_XSLT_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$XSLT_CONFIG"; then
+- ac_cv_prog_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_XSLT_CONFIG="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-XSLT_CONFIG=$ac_cv_prog_XSLT_CONFIG
+-if test -n "$XSLT_CONFIG"; then
+- { echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
+-echo "${ECHO_T}$XSLT_CONFIG" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- test -n "$XSLT_CONFIG" && break
+-done
+-
+-fi
+-
+-
+ # Check whether --with-curl-config was given.
+ if test "${with_curl_config+set}" = set; then
+ withval=$with_curl_config; curl_config="$withval"
+@@ -24702,8 +24635,8 @@
+
+ oCPPFLAGS="$CPPFLAGS"
+ oLIBS="$LIBS"
+-if test "X$XSLT_CONFIG" != X; then
+- LIBS="$LIBS `$XSLT_CONFIG --libs`"
++if test 0; then
++ LIBS="$LIBS $LIBXSLT_LIBS"
+ { echo "$as_me:$LINENO: checking for xsltSaveResultToString" >&5
+ echo $ECHO_N "checking for xsltSaveResultToString... $ECHO_C" >&6; }
+ if test "${ac_cv_func_xsltSaveResultToString+set}" = set; then
+@@ -24795,17 +24728,6 @@
+ echo $ECHO_N "checking for system libxslt library... $ECHO_C" >&6; }
+ if test $have_xsltSaveResultToString = yes; then
+ have_libxslt=1
+- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
+- LIBXSLT_VERSION=`$XSLT_CONFIG --version`
+- libxslt_version_dec=`echo $LIBXSLT_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+- libxslt_min_version_dec=`echo $libxslt_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+- { echo "$as_me:$LINENO: result: yes - version $LIBXSLT_VERSION" >&5
+-echo "${ECHO_T}yes - version $LIBXSLT_VERSION" >&6; }
+- if test $libxslt_version_dec -lt $libxslt_min_version_dec; then
+- { echo "$as_me:$LINENO: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&5
+-echo "$as_me: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&2;}
+- have_libxslt=0
+- fi
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -26395,8 +26317,8 @@
fi
if test $need_libxslt = 1; then
commit 7999a0c4e14c2c30e9f6758a347cc45721769179
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:44:50 2011 +0300
Do nothing when cross-compiling in general, not just for iOS
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 14a803e..f9e0622 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -34,7 +34,10 @@ TARGET=icc
.INCLUDE : settings.mk
-.IF "$(OS)"!="IOS"
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
# --- Files --------------------------------------------------------
@@ -58,8 +61,5 @@ BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIB
.INCLUDE : set_ext.mk
-.ENDIF
.INCLUDE : target.mk
-.IF "$(OS)"!="IOS"
.INCLUDE : tg_ext.mk
-.ENDIF
commit 1fc9f649427dbdb0cd58b0a8ac8ccc99388e8fe8
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:05:01 2011 +0300
Add cross-compilation support
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 20efead..563c756 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -80,6 +80,10 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
.ENDIF
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+.ENDIF
+
BUILD_ACTION=make
OUT2INC += mythes.hxx
.ENDIF
commit 8fe1738cd4cae6a3b3eb467605c9d8e81355930d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jun 6 08:57:32 2011 +0300
Always compare CROSS_COMPILING explicitly to "YES"
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 265bcdc..4315adf 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,7 +40,7 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912630&group_id=11795&atid=311795>
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
.IF "$(OS)" == "WNT"
.IF "$(COM)" == "MSC"
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 741288c..53765c9 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -11,7 +11,7 @@ TARGET=gcc3_specific
.IF "$(GUI)" == "WNT"
-.IF "$(CROSS_COMPILING)" == ""
+.IF "$(CROSS_COMPILING)" != "YES"
# Don't do any of this weird and presumably obsolete crack when
# cross-compiling
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index 83d9011..1928a2c 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -33,7 +33,7 @@ TARGET=mingwheaders
.IF "$(OS)$(COM)" == "WNTGCC"
-.IF "$(CROSS_COMPILING)" == ""
+.IF "$(CROSS_COMPILING)" != "YES"
# Don't do any of this weird and presumably obsolete crack when
# cross-compiling
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index d7169e4..80f5bbd 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -99,8 +99,8 @@ BUILD_ACTION=dmake
OUT2INC += hyphen.h
.ENDIF # "$(GUI)"=="WNT"
-.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 74b1804..d47c130 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -67,8 +67,8 @@ CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
.IF "$(OS)"=="IOS"
CONFIGURE_FLAGS+= --disable-shared
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=make
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 248a721..3b6f696 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
raptor-aix.patch
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
OOO_PATCH_FILES += \
$(TARFILE_NAME).patch.cross
.ENDIF
@@ -145,7 +145,7 @@ CONFIGURE_FLAGS=--disable-static
.ENDIF
# do not enable grddl parser (#i93768#)
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(GNUMAKE)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 417df11..dbad2d2 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -130,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index ec4941c..b38c45a 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -134,7 +134,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
commit dcfd860f5bb25ff6b2d80c1cfb209f70222c5cd0
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 00:47:28 2011 +0300
Bin unnecessary quoting
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index f837105..248a721 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -146,7 +146,7 @@ CONFIGURE_FLAGS=--disable-static
# do not enable grddl parser (#i93768#)
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 2b09a4d..417df11 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -131,7 +131,7 @@ CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index bbfe814..ec4941c 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -135,7 +135,7 @@ CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
commit 1b91d8287201609fd76178568453ea82f980c972
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 00:44:45 2011 +0300
Patch raptor configure, not configure.ac for cross-compilation
It looks sillier, yes, but it is good to not have to run
autoconf. Fixes cross-compilation for ppc MacOSX.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index e0e4968..f837105 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -137,11 +137,10 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
.EXPORT: XSLTLIB
CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
.IF "$(OS)"=="IOS"
-CONFIGURE_ACTION=autoconf; .$/configure
CONFIGURE_FLAGS=--disable-shared
.ELSE
-CONFIGURE_ACTION=.$/configure
CONFIGURE_FLAGS=--disable-static
.ENDIF
# do not enable grddl parser (#i93768#)
diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.patch.cross
index 5262dc1..bf4c432 100644
--- a/redland/raptor/raptor-1.4.18.patch.cross
+++ b/redland/raptor/raptor-1.4.18.patch.cross
@@ -1,23 +1,35 @@
---- misc/raptor-1.4.18/configure.ac
-+++ misc/build/raptor-1.4.18/configure.ac
-@@ -295,7 +295,9 @@
- return is_c99("1234567");
- }], AC_MSG_RESULT(no),
- AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
-- AC_MSG_RESULT(yes))
-+ AC_MSG_RESULT(yes),
-+ AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
-+ AC_MSG_RESULT([guessing yes]))
- fi
-
- need_libm=no
-@@ -456,7 +458,8 @@
- AC_DEFINE(EXPAT_UTF8_BOM_CRASH, 1, [does expat crash when it sees an initial UTF8 BOM?])
- AC_MSG_RESULT(no)
- AC_MSG_WARN(The available expat crashes on XML UTF-8 BOM in documents)
-- AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+))
-+ AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+),
-+ AC_MSG_RESULT(guessing yes))
-
- else
- AC_MSG_RESULT(no)
+--- misc/raptor-1.4.18/configure
++++ misc/build/raptor-1.4.18/configure
+@@ -22643,11 +22643,13 @@
+ { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5
+ echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_C99_VSNPRINTF 1
++_ACEOF
++
++ { echo "$as_me:$LINENO: result: guessing yes" >&5
++echo "${ECHO_T}guessing yes" >&6; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -23367,11 +23369,8 @@
+ { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5
+ echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++ { echo "$as_me:$LINENO: result: guessing yes" >&5
++echo "${ECHO_T}guessing yes" >&6; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
commit 4a97a447960d97441d2e151f8ed10ccc4a1b8431
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Sat Jun 4 02:03:19 2011 +0200
make sure to compile against SDK version of libxml/libxslt
might not be the most elegant solution, but should do the trick
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 61d1e5a..e0e4968 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_raptor
.IF "$(SYSTEM_REDLAND)" == "YES"
all:
- @echo "An already available installation of Redland RDF should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
+ @echo "An already available installation of Redland RDF should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
.ENDIF
# --- Files --------------------------------------------------------
@@ -66,6 +66,12 @@ OOO_PATCH_FILES += \
PATCH_FILES=$(OOO_PATCH_FILES)
+.IF "$(SYSTEM_LIBXML)" == "YES"
+PATCH_FILES+=raptor-1.4.18.libxml.patch
+.ENDIF
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+PATCH_FILES+=raptor-1.4.18.libxslt.patch
+.ENDIF
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch
new file mode 100644
index 0000000..d5627cd
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.libxml.patch
@@ -0,0 +1,13 @@
+--- misc/raptor-1.4.18/configure 2011-06-04 01:25:04.000000000 +0200
++++ misc/build/raptor-1.4.18/configure 2011-06-04 01:24:57.000000000 +0200
+@@ -26447,8 +26447,8 @@
+ CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
+ LIBS="$LIBS -Llibxml -llibxml"
+ else
+- LIBS="$LIBS `$XML_CONFIG --libs`"
+- CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
++ LIBS="$LIBS $LIBXML_LIBS"
++ CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
+ fi
+ RAPTOR_XML_PARSER=libxml
+ fi
diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch
new file mode 100644
index 0000000..488aa48
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.libxslt.patch
@@ -0,0 +1,13 @@
+--- misc/raptor-1.4.18/configure 2011-06-04 01:34:34.000000000 +0200
++++ misc/build/raptor-1.4.18/configure 2011-06-04 01:34:08.000000000 +0200
+@@ -26474,8 +26474,8 @@
+ fi
+
+ if test $need_libxslt = 1; then
+- LIBS="$LIBS `$XSLT_CONFIG --libs`"
+- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
++ LIBS="$LIBS $LIBXSLT_LIBS"
++ CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS"
+ fi
+
+ RAPTOR_LIBTOOLLIBS=libraptor.la
commit 84743ff1838f49e4bfee26d106732aede9c673d4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:27:22 2011 +0300
Drop %_EXT% which was always empty
diff --git a/Mesa/prj/d.lst b/Mesa/prj/d.lst
index 5991e20..9690bd4 100644
--- a/Mesa/prj/d.lst
+++ b/Mesa/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\GL
+mkdir: %_DEST%\inc\GL
-..\inc\*.h %_DEST%\inc%_EXT%\GL\*.h
+..\inc\*.h %_DEST%\inc\GL\*.h
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
index 78396a6..1652d1f 100644
--- a/afms/prj/d.lst
+++ b/afms/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\pck%_EXT%
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+mkdir: %_DEST%\pck
+..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
index ef6dd46..8d05687 100644
--- a/apple_remote/prj/d.lst
+++ b/apple_remote/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\apple_remote
-..\inc\*.h %_DEST%\inc%_EXT%\apple_remote\*
+mkdir: %_DEST%\inc\apple_remote
+..\inc\*.h %_DEST%\inc\apple_remote\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst
index 6614623..ea4006c 100644
--- a/beanshell/prj/d.lst
+++ b/beanshell/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar
+..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin\bsh.jar
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 29dac2b..28b7095 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -1,36 +1,36 @@
-mkdir: %_DEST%\inc%_EXT%\cppunit
-..\%__SRC%\inc\cppunit\*.h %_DEST%\inc%_EXT%\cppunit\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\config
-..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc%_EXT%\cppunit\config\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\extensions
-..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc%_EXT%\cppunit\extensions\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\plugin
-..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc%_EXT%\cppunit\plugin\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\portability
-..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc%_EXT%\cppunit\portability\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\tools
-..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc%_EXT%\cppunit\tools\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text
-..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc%_EXT%\cppunit\ui\text\*.h
+mkdir: %_DEST%\inc\cppunit
+..\%__SRC%\inc\cppunit\*.h %_DEST%\inc\cppunit\*.h
+mkdir: %_DEST%\inc\cppunit\config
+..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc\cppunit\config\*.h
+mkdir: %_DEST%\inc\cppunit\extensions
+..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc\cppunit\extensions\*.h
+mkdir: %_DEST%\inc\cppunit\plugin
+..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc\cppunit\plugin\*.h
+mkdir: %_DEST%\inc\cppunit\portability
+..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc\cppunit\portability\*.h
+mkdir: %_DEST%\inc\cppunit\tools
+..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc\cppunit\tools\*.h
+mkdir: %_DEST%\inc\cppunit\ui\text
+..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc\cppunit\ui\text\*.h
-..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin%_EXT%\cppunit_dll.dll
-..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib
+..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin\cppunit_dll.dll
+..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib\icppunit_dll.lib
-..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll
-..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a
+..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin\cygcppunit-1-12-1.dll
+..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib\libcppunit.dll.a
-..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib
+..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib
+symlink: %_DEST%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit.dylib
-..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so
+..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit-1.12.so.1
+symlink: %_DEST%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit.so
-..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit.so
+..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit-1.12.so.1.0
+symlink: %_DEST%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit.so
-..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a
+..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit-1.12.a
+symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a
-..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester
-..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe
-..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe
+..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
+..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
+..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
diff --git a/epm/prj/d.lst b/epm/prj/d.lst
index 5eea5f2..315d3d1 100644
--- a/epm/prj/d.lst
+++ b/epm/prj/d.lst
@@ -1,3 +1,3 @@
-..\%__SRC%\bin\epm %_DEST%\bin%_EXT%\epm
-..\%__SRC%\bin\epminstall %_DEST%\bin%_EXT%\epminstall
-..\%__SRC%\bin\mkepmlist %_DEST%\bin%_EXT%\mkepmlist
+..\%__SRC%\bin\epm %_DEST%\bin\epm
+..\%__SRC%\bin\epminstall %_DEST%\bin\epminstall
+..\%__SRC%\bin\mkepmlist %_DEST%\bin\mkepmlist
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 7809c07..55e10bc 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -1,57 +1,57 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\glibc
-mkdir: %_DEST%\inc%_EXT%\external\mingw
-mkdir: %_DEST%\inc%_EXT%\external\mingw\include
-mkdir: %_DEST%\inc%_EXT%\external\mingw\include\atl
-mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\glibc
+mkdir: %_DEST%\inc\external\mingw
+mkdir: %_DEST%\inc\external\mingw\include
+mkdir: %_DEST%\inc\external\mingw\include\atl
+mkdir: %_DEST%\inc\external\mingw\include\sys
-..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h
-..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h
+..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h
+..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
-..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
+..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib\gnu_getopt.lib
+..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib\libgnu_getopt.a
+..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib\libgnu_getopt_static.a
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+..\%__SRC%\inc\*.h %_DEST%\inc\external\glibc\*.h
-..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
-..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
-..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
+..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc\external\mingw\include\*
+..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc\external\mingw\include\atl\*
+..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc\external\mingw\include\sys\*
-..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\libautorec*.* %_DEST%\lib\lib*.*
-..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
-..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
+..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib\libgcc_s.so.*
+..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib\libstdc++.so.*
-..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll
+..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll
-..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll
+..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll
-..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+..\msvcp80\msvcm80*.dll %_DEST%\bin
+..\msvcp80\msvcp80*.dll %_DEST%\bin
+..\msvcp80\msvcr80*.dll %_DEST%\bin
+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin\Microsoft.VC80.CRT.manifest
+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin\Microsoft.VC80.DebugCRT.manifest
-..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
-..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
-..\msvcp90\msvcr90*.dll %_DEST%\bin%_EXT%
-..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.CRT.manifest
-..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
-..\msm90\*.msm %_DEST%\bin%_EXT%
+..\msvcp90\msvcm90*.dll %_DEST%\bin
+..\msvcp90\msvcp90*.dll %_DEST%\bin
+..\msvcp90\msvcr90*.dll %_DEST%\bin
+..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
+..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
+..\msm90\*.msm %_DEST%\bin
-..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
+..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll
-..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe
-..\vcredist\vcredist_x64.exe %_DEST%\bin%_EXT%\vcredist_x64.exe
+..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe
+..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe
-..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
-..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll
-..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll
+..\%__SRC%\bin\mingwm10.dll %_DEST%\bin\mingwm10.dll
+..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll
+..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll
-..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.*
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
linklib: libgcc_s.*.*
diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst
index 8801f4f..d432e98 100644
--- a/hsqldb/prj/d.lst
+++ b/hsqldb/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin%_EXT%\hsqldb.jar
+..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin\hsqldb.jar
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
index 4b7ff0b..4758ed7 100644
--- a/hyphen/prj/d.lst
+++ b/hyphen/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\slb\hyphen.lib %_DEST%\lib%_EXT%\hyphen.lib
+..\%__SRC%\slb\hyphen.lib %_DEST%\lib\hyphen.lib
-..\%__SRC%\inc\hyphen.h %_DEST%\inc%_EXT%\hyphen.h
-..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
-..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic
+..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h
+..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib\libhyphen.a
+..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic
diff --git a/icc/prj/d.lst b/icc/prj/d.lst
index 864e947..553de38 100644
--- a/icc/prj/d.lst
+++ b/icc/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\icc
-mkdir: %_DEST%\inc%_EXT%\external\icc
+mkdir: %_DEST%\inc\icc
+mkdir: %_DEST%\inc\external\icc
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc%_EXT%\icc\sRGB*.hxx
+..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
index 0e7f563..9e060ae 100644
--- a/libtextcat/prj/d.lst
+++ b/libtextcat/prj/d.lst
@@ -1,12 +1,12 @@
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\ilib*.* %_DEST%\lib%_EXT%\ilib*.*
-..\%__SRC%\bin\l*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
+..\%__SRC%\lib\ilib*.* %_DEST%\lib\ilib*.*
+..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
-mkdir: %_DEST%\inc%_EXT%\libtextcat
-..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc%_EXT%\libtextcat\*.h
+mkdir: %_DEST%\inc\libtextcat
+..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc\libtextcat\*.h
# data for language guessing
-..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck%_EXT%\fpdb.conf
-..\data\new_fingerprints\lm\*.lm %COMMON_DEST%\pck%_EXT%\*.lm
+..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
+..\data\new_fingerprints\lm\*.lm %COMMON_DEST%\pck\*.lm
diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst
index 070c6fb..f03b25b 100644
--- a/libvisio/prj/d.lst
+++ b/libvisio/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc%_EXT%\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc%_EXT%\libvisio\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libvisio
+..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio
+..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
index ef69443..f891f3b 100644
--- a/libwpd/prj/d.lst
+++ b/libwpd/prj/d.lst
@@ -1,15 +1,15 @@
-mkdir: %_DEST%\inc%_EXT%\libwpd
-mkdir: %_DEST%\inc%_EXT%\libwpd-stream
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc%_EXT%\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc%_EXT%\libwpd-stream\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libwpd
+mkdir: %_DEST%\inc\libwpd-stream
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
index 2093e0d..a6a84a3 100644
--- a/libwpg/prj/d.lst
+++ b/libwpg/prj/d.lst
@@ -1,6 +1,6 @@
-mkdir: %_DEST%\inc%_EXT%\libwpg
-..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libwpg
+..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
index a71985a..3923a18 100644
--- a/libwps/prj/d.lst
+++ b/libwps/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\libwps
-..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libwps
+..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc\libwps\
+..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc\libwps\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libxmlsec/prj/d.lst b/libxmlsec/prj/d.lst
index 064bd9e..21896b5 100644
--- a/libxmlsec/prj/d.lst
+++ b/libxmlsec/prj/d.lst
@@ -1,9 +1,9 @@
-mkdir: %_DEST%\inc%_EXT%\external\xmlsec
-mkdir: %_DEST%\inc%_EXT%\external\xmlsec\nss
-mkdir: %_DEST%\inc%_EXT%\external\xmlsec\mscrypto
-..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc%_EXT%\external\xmlsec\*.h
-..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc%_EXT%\external\xmlsec\nss\*.h
-..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc%_EXT%\external\xmlsec\mscrypto\*.h
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+mkdir: %_DEST%\inc\external\xmlsec
+mkdir: %_DEST%\inc\external\xmlsec\nss
+mkdir: %_DEST%\inc\external\xmlsec\mscrypto
+..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc\external\xmlsec\*.h
+..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc\external\xmlsec\nss\*.h
+..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc\external\xmlsec\mscrypto\*.h
+..\%__SRC%\lib\lib*.a %_DEST%\lib
+..\%__SRC%\lib\*.lib %_DEST%\lib
+..\%__SRC%\bin\*.dll %_DEST%\bin
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index cb52247..68001dc 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -1,10 +1,10 @@
-mkdir: %_DEST%\inc%_EXT%\lpsolve
+mkdir: %_DEST%\inc\lpsolve
-..\%__SRC%\inc\lp_*.h %_DEST%\inc%_EXT%\lpsolve\*
-..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so
-..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
-..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib
-..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib%_EXT%\liblpsolve55.a
-..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
-..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll
+..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\*
+..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so
+..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
+..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
+..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
+..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
+..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
diff --git a/lucene/prj/d.lst b/lucene/prj/d.lst
index 553fc44..97c8968 100644
--- a/lucene/prj/d.lst
+++ b/lucene/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\lucene
-..\%__SRC%\bin\lucene-*.jar %_DEST%\bin%_EXT%\lucene-*.jar
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\lucene
+..\%__SRC%\bin\lucene-*.jar %_DEST%\bin\lucene-*.jar
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
index 9c4dd58..62d44f3 100644
--- a/mdds/prj/d.lst
+++ b/mdds/prj/d.lst
@@ -1,7 +1,7 @@
-mkdir: %_DEST%\inc%_EXT%\mdds
-mkdir: %_DEST%\inc%_EXT%\mdds\hash_container
+mkdir: %_DEST%\inc\mdds
+mkdir: %_DEST%\inc\mdds\hash_container
-..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds
-..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc%_EXT%\mdds\hash_container
+..\%__SRC%\inc\mdds\* %_DEST%\inc\mdds
+..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc\mdds\hash_container
diff --git a/mysqlcppconn/prj/d.lst b/mysqlcppconn/prj/d.lst
index 7a32571..5541358 100644
--- a/mysqlcppconn/prj/d.lst
+++ b/mysqlcppconn/prj/d.lst
@@ -1,15 +1,15 @@
# mirror the dir structure a make install would create
-mkdir: %_DEST%\inc%_EXT%\mysqlcppconn
-mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn
+mkdir: %_DEST%\inc\mysqlcppconn
+mkdir: %_DEST%\inc\mysqlcppconn\cppconn
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mysqlcppconn\*.h
-..\%__SRC%\inc\cppconn\*.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\*.h
+..\%__SRC%\inc\*.h %_DEST%\inc\mysqlcppconn\*.h
+..\%__SRC%\inc\cppconn\*.h %_DEST%\inc\mysqlcppconn\cppconn\*.h
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
- ..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%
+ ..\%__SRC%\lib\lib*.so* %_DEST%\lib
+..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.dylib.* %_DEST%\lib\*.dylib.*
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\lib\i*.lib %_DEST%\lib
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
index 417855e..375161f 100644
--- a/mythes/prj/d.lst
+++ b/mythes/prj/d.lst
@@ -1,7 +1,7 @@
-..\%__SRC%\slb\libmythes.lib %_DEST%\lib%_EXT%\libmythes.lib
+..\%__SRC%\slb\libmythes.lib %_DEST%\lib\libmythes.lib
-..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
-..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
-..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
-..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin%_EXT%\th_gen_idx.pl
+..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx
+..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
+..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
+..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl
diff --git a/np_sdk/prj/d.lst b/np_sdk/prj/d.lst
index eaad1f5..cfd2429 100644
--- a/np_sdk/prj/d.lst
+++ b/np_sdk/prj/d.lst
@@ -1,7 +1,7 @@
-mkdir: %_DEST%\inc%_EXT%\npsdk
+mkdir: %_DEST%\inc\npsdk
-..\mozsrc\*.h %_DEST%\inc%_EXT%\npsdk\*.h
+..\mozsrc\*.h %_DEST%\inc\npsdk\*.h
-..\%__SRC%\slo\npunix.o %_DEST%\lib%_EXT%\npunix.o
-..\%__SRC%\slo\npunix.obj %_DEST%\lib%_EXT%\npunix.obj
-..\%__SRC%\slo\npwin.obj %_DEST%\lib%_EXT%\npwin.obj
+..\%__SRC%\slo\npunix.o %_DEST%\lib\npunix.o
+..\%__SRC%\slo\npunix.obj %_DEST%\lib\npunix.obj
+..\%__SRC%\slo\npwin.obj %_DEST%\lib\npwin.obj
diff --git a/openssl/prj/d.lst b/openssl/prj/d.lst
index 7206585..109bbaa 100644
--- a/openssl/prj/d.lst
+++ b/openssl/prj/d.lst
@@ -1,11 +1,11 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\openssl
-..\version.mk %_DEST%\inc%_EXT%\external\openssl\version.mk
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl
-..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib
-..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
-..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib
-..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll
-..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a
-..\%__SRC%\lib\libssl.a %_DEST%\lib%_EXT%\libssl.a
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\openssl
+..\version.mk %_DEST%\inc\external\openssl\version.mk
+..\%__SRC%\inc\*.h %_DEST%\inc\external\openssl
+..\%__SRC%\lib\ssleay32.lib %_DEST%\lib\ssleay32.lib
+..\%__SRC%\bin\ssleay32.dll %_DEST%\bin\ssleay32.dll
+..\%__SRC%\lib\libeay32.lib %_DEST%\lib\libeay32.lib
+..\%__SRC%\bin\libeay32.dll %_DEST%\bin\libeay32.dll
+..\%__SRC%\lib\libcrypto.a %_DEST%\lib\libcrypto.a
+..\%__SRC%\lib\libssl.a %_DEST%\lib\libssl.a
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index f96f3a5..20bae4d 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,19 +1,19 @@
-mkdir: %_DEST%\inc%_EXT%\external
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
-symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
-symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
-..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0
-symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so
-..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib
-symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
-..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk
+mkdir: %_DEST%\inc\external
+..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h
+..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1
+symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so
+..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib
+symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib
+..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1
+symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so
+..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib
+symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib
+..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0
+symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so
+..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib
+symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib
+..\%__SRC%\lib\*.lib %_DEST%\lib
+..\%__SRC%\lib\*.a %_DEST%\lib
+..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a
+..\%__SRC%\bin\*.dll %_DEST%\bin
+..\redlandversion.mk %_DEST%\inc\redlandversion.mk
diff --git a/rhino/prj/d.lst b/rhino/prj/d.lst
index 8fb6716..b98f6b7 100644
--- a/rhino/prj/d.lst
+++ b/rhino/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin%_EXT%\js.jar
+..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin\js.jar
diff --git a/sane/prj/d.lst b/sane/prj/d.lst
index ee8c0c6..f592821 100644
--- a/sane/prj/d.lst
+++ b/sane/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\sane
-..\inc\sane.h %_DEST%\inc%_EXT%\external\sane\sane.h
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\sane
+..\inc\sane.h %_DEST%\inc\external\sane\sane.h
diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst
index ca4fe7a..31d61b0 100644
--- a/translate_toolkit/prj/d.lst
+++ b/translate_toolkit/prj/d.lst
@@ -1,35 +1,35 @@
-mkdir: %_DEST%\bin%_EXT%\translate
-mkdir: %_DEST%\bin%_EXT%\translate\convert
-mkdir: %_DEST%\bin%_EXT%\translate\filters
-mkdir: %_DEST%\bin%_EXT%\translate\lang
-mkdir: %_DEST%\bin%_EXT%\translate\misc
-mkdir: %_DEST%\bin%_EXT%\translate\misc\typecheck
-mkdir: %_DEST%\bin%_EXT%\translate\storage
-mkdir: %_DEST%\bin%_EXT%\translate\storage\placeables
-mkdir: %_DEST%\bin%_EXT%\translate\storage\versioncontrol
-mkdir: %_DEST%\bin%_EXT%\translate\storage\xml_extract
-mkdir: %_DEST%\bin%_EXT%\translate\search
-mkdir: %_DEST%\bin%_EXT%\translate\search\indexing
-mkdir: %_DEST%\bin%_EXT%\translate\services
-mkdir: %_DEST%\bin%_EXT%\translate\share
-mkdir: %_DEST%\bin%_EXT%\translate\share\langmodels
-mkdir: %_DEST%\bin%_EXT%\translate\tools
+mkdir: %_DEST%\bin\translate
+mkdir: %_DEST%\bin\translate\convert
+mkdir: %_DEST%\bin\translate\filters
+mkdir: %_DEST%\bin\translate\lang
+mkdir: %_DEST%\bin\translate\misc
+mkdir: %_DEST%\bin\translate\misc\typecheck
+mkdir: %_DEST%\bin\translate\storage
+mkdir: %_DEST%\bin\translate\storage\placeables
+mkdir: %_DEST%\bin\translate\storage\versioncontrol
+mkdir: %_DEST%\bin\translate\storage\xml_extract
+mkdir: %_DEST%\bin\translate\search
+mkdir: %_DEST%\bin\translate\search\indexing
+mkdir: %_DEST%\bin\translate\services
+mkdir: %_DEST%\bin\translate\share
+mkdir: %_DEST%\bin\translate\share\langmodels
+mkdir: %_DEST%\bin\translate\tools
-..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin%_EXT%\translate\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin%_EXT%\translate\convert\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin%_EXT%\translate\filters\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin%_EXT%\translate\lang\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin%_EXT%\translate\misc\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin%_EXT%\translate\misc/typecheck\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin%_EXT%\translate\storage\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin%_EXT%\translate\storage/placeables\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin%_EXT%\translate\storage/versioncontrol\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin%_EXT%\translate\storage/xml_extract\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin%_EXT%\translate\search\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin%_EXT%\translate\search/indexing\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin%_EXT%\translate\services\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin%_EXT%\translate\share\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin%_EXT%\translate\share\langmodels\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin%_EXT%\translate\tools\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po %_DEST%\bin%_EXT%\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo %_DEST%\bin%_EXT%\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin\translate\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin\translate\convert\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin\translate\filters\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin\translate\lang\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin\translate\misc\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin\translate\misc/typecheck\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin\translate\storage\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin\translate\storage/placeables\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin\translate\storage/versioncontrol\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin\translate\storage/xml_extract\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin\translate\search\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin\translate\search/indexing\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin\translate\services\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin\translate\share\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin\translate\share\langmodels\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin\translate\tools\*
+..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po %_DEST%\bin\*
+..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo %_DEST%\bin\*
diff --git a/twain/prj/d.lst b/twain/prj/d.lst
index e26c5db..0827b03 100644
--- a/twain/prj/d.lst
+++ b/twain/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\twain
-..\%__SRC%\inc\twain.h %_DEST%\inc%_EXT%\external\twain\twain.h
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\twain
+..\%__SRC%\inc\twain.h %_DEST%\inc\external\twain\twain.h
diff --git a/unixODBC/prj/d.lst b/unixODBC/prj/d.lst
index 2825e1c..6b3fa94 100644
--- a/unixODBC/prj/d.lst
+++ b/unixODBC/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\odbc
-..\inc\*.h %_DEST%\inc%_EXT%\external\odbc\*.h
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\odbc
+..\inc\*.h %_DEST%\inc\external\odbc\*.h
diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst
index 395b3e4..ddf8faf 100644
--- a/vigra/prj/d.lst
+++ b/vigra/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\vigra
+mkdir: %_DEST%\inc\vigra
-..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc%_EXT%\vigra\*.hxx
+..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx
diff --git a/x11_extensions/prj/d.lst b/x11_extensions/prj/d.lst
index ca96875..d3c8c6a 100644
--- a/x11_extensions/prj/d.lst
+++ b/x11_extensions/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\X11
-mkdir: %_DEST%\inc%_EXT%\X11\extensions
+mkdir: %_DEST%\inc\X11
+mkdir: %_DEST%\inc\X11\extensions
-..\inc\*.h %_DEST%\inc%_EXT%\X11\extensions\*.h
+..\inc\*.h %_DEST%\inc\X11\extensions\*.h
diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst
index fec9689..ee5b0e2 100644
--- a/xsltml/prj/d.lst
+++ b/xsltml/prj/d.lst
@@ -1,6 +1,6 @@
-mkdir: %_DEST%\bin%_EXT%\xslt
-mkdir: %_DEST%\bin%_EXT%\xslt\export
-mkdir: %_DEST%\bin%_EXT%\xslt\export\xsltml
+mkdir: %_DEST%\bin\xslt
+mkdir: %_DEST%\bin\xslt\export
+mkdir: %_DEST%\bin\xslt\export\xsltml
-..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin%_EXT%\xslt\export\xsltml\*.xsl
+..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin\xslt\export\xsltml\*.xsl
commit 10ec7f8a2f31d61a4511f44dd9a6e190dd1b977f
Merge: f66e793... 361d02b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 31 10:45:52 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
libwps/makefile.mk
diff --cc np_sdk/mozsrc/npapi.h
index e0863b1,4a14df5..c87d531
--- a/np_sdk/mozsrc/npapi.h
+++ b/np_sdk/mozsrc/npapi.h
@@@ -42,11 -42,22 +42,12 @@@
* Netscape client plug-in API spec
*/
- #ifndef _NPAPI_H_
+ #if !defined(_NPAPI_H_) && !defined(npapi_h_)
#define _NPAPI_H_
+ #define npapi_h_
-#ifdef __OS2__
-#pragma pack(1)
-#endif
-
#include "jri.h" /* Java Runtime Interface */
-#if defined (__OS2__ ) || defined (OS2)
-# ifndef XP_OS2
-# define XP_OS2 1
-# endif /* XP_OS2 */
-#endif /* __OS2__ */
-
#ifdef _WINDOWS
# ifndef XP_WIN
# define XP_WIN 1
commit f66e7931612264005a5c64e247c641a7ed39cb71
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon May 30 00:04:27 2011 +0300
Fix typo
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index f7c6f8a..bbfe814 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -131,7 +131,7 @@ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
.IF "$(OS)"=="IOS"
CONFIGURE_FLAGS=--disable-shared
.ELSE
-CONFIGURE_FKAGS=--disable-static
+CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!=""
commit 7f68a802e78a96cc619f2f0de837668388a12ed9
Merge: ce421e6... 6713b11...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 21:18:05 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern
commit ce421e6db0ae636dded30584c0722a3fa0e6fb1e
Merge: 6042d4a... ee795d2...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:54:44 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
rhino/makefile.mk
commit 6713b11417e7e4a3f5c78168d405e0212e8b833f
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 26 01:10:30 2011 +0300
Presumably no need for this for iOS
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 4bbde85..14a803e 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -34,6 +34,8 @@ TARGET=icc
.INCLUDE : settings.mk
+.IF "$(OS)"!="IOS"
+
# --- Files --------------------------------------------------------
TARFILE_NAME=SampleICC-1.3.2
@@ -51,10 +53,13 @@ CONVERTFILES= \
CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
+
+.ENDIF
.INCLUDE : target.mk
+.IF "$(OS)"!="IOS"
.INCLUDE : tg_ext.mk
-
-
+.ENDIF
commit 361d02b1792afb84bc9641a6eb683f6956d405db
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:13 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit 6042d4a2af45cb9446e879bea0deca6939bf1410
Author: Robert Nagy <robert at openbsd.org>
Date: Sun May 22 11:24:38 2011 +0200
-ldl is linux only and remove -lc from the flags too
diff --git a/lpsolve/lp_solve_5.5-openbsd.patch b/lpsolve/lp_solve_5.5-openbsd.patch
deleted file mode 100644
index d632d91..0000000
--- a/lpsolve/lp_solve_5.5-openbsd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/lp_solve_5.5/lpsolve55/ccc Fri Nov 5 13:51:18 2010
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc Fri Nov 5 13:51:11 2010
-@@ -6,7 +6,7 @@
- if [ "$PLATFORM" = "SCO_UNIX" ]
- then def='-dy -K PIC -DNOLONGLONG'
- dl=-lc
--else dl=-ldl
-+else
- so=y
- fi
-
-@@ -19,7 +19,7 @@
- if [ "$so" != "" ]
- then
- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
- fi
-
- rm *.o 2>/dev/null
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 661a8d3..5edcd0d 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -1,40 +1,53 @@
---- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008
-@@ -1,11 +1,20 @@
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005
++++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011
+@@ -1,15 +1,28 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
def=
so=
-+soprefix=
-+libs=
-+pic=
-+ldflags=
-+inline=
-if [ "$PLATFORM" = "SCO_UNIX" ]
-then def='-dy -K PIC -DNOLONGLONG'
- dl=-lc
-else dl=-ldl
- so=y
++soprefix=
++libs=
++pic=
++ldflags=
++inline=
+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
+ so=dll
+ inline=-DINLINE=static
+else
+ so=so
+ soprefix=lib
-+ libs="-lc -lm -ldl"
++ libs="-lm"
+ pic=-fpic
+ ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
fi
-@@ -19,3 +19,3 @@
+
++if [ "$OS" = "LINUX" ]; then
++ libs="$libs -ldl"
++fi
++
+ opts='-O3'
+
+ $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+@@ -18,8 +31,8 @@
+
+ if [ "$so" != "" ]
+ then
- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
+ $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
fi
---- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008
+
+ rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011
@@ -1,8 +1,12 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
@@ -66,9 +79,9 @@
fi
rm *.o 2>/dev/null
---- misc/lp_solve_5.5/lpsolve55/ccc.solaris Wed May 21 17:45:07 2008
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Wed May 21 17:44:54 2008
-@@ -1,1 +1,31 @@
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig Sun May 22 11:19:48 2011
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Sun May 22 11:19:48 2011
+@@ -1 +1,31 @@
-dummy
+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+c=$CC
@@ -101,9 +114,9 @@
+fi
+
+rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.ios
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios
-@@ -1,1 +1,11 @@
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios Sun May 22 11:19:48 2011
+@@ -1 +1,11 @@
-dummy
+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 21dca49..7e47591 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -48,10 +48,6 @@ PATCH_FILES=\
ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios
.ENDIF
-.IF "$(OS)"=="OPENBSD"
-PATCH_FILES+=lp_solve_5.5-openbsd.patch
-.ENDIF
-
CONFIGURE_DIR=
CONFIGURE_ACTION=
CONFIGURE_FLAGS=
commit 60eb0c9aa0442a69e27fcdd49774d98f33a0db7d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun May 22 10:53:50 2011 +0300
Bypass some weird crack when cross-compiling with MinGW
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 952b9b9..741288c 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -11,6 +11,10 @@ TARGET=gcc3_specific
.IF "$(GUI)" == "WNT"
+.IF "$(CROSS_COMPILING)" == ""
+# Don't do any of this weird and presumably obsolete crack when
+# cross-compiling
+
.IF "$(COM)" == "GCC"
.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
@@ -38,6 +42,8 @@ $(MINGWGXXDLL) :
.ENDIF
+.ENDIF
+
.ELSE
.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index ccfc958..83d9011 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -33,6 +33,10 @@ TARGET=mingwheaders
.IF "$(OS)$(COM)" == "WNTGCC"
+.IF "$(CROSS_COMPILING)" == ""
+# Don't do any of this weird and presumably obsolete crack when
+# cross-compiling
+
# Cygwin and MinGW use different directories for the W32API headers
.IF "$(USE_MINGW)" == "cygwin"
MINGW_INCLUDE_DIR=$/usr$/include/mingw/
@@ -206,5 +210,7 @@ clean:
.ENDIF
+.ENDIF
+
.INCLUDE : target.mk
commit 26467479b775d27097224a3783d2a6d82401324b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 21 16:34:45 2011 +0300
Drop OS2
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 529020f..d7169e4 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -99,11 +99,6 @@ BUILD_ACTION=dmake
OUT2INC += hyphen.h
.ENDIF # "$(GUI)"=="WNT"
-.IF "$(GUI)"=="OS2"
-BUILD_ACTION=dmake
-OUT2INC += hyphen.h
-.ENDIF # "$(GUI)"=="OS2"
-
.IF "$(CROSS_COMPILING)"!=""
CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
.ENDIF
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index e1b480b..74b1804 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -84,9 +84,9 @@ OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST)
.ENDIF # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
BUILD_ACTION=cd src && dmake $(MAKEMACROS)
-.ENDIF # "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ENDIF # "$(GUI)"=="WNT"
OUT2INC= \
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 2d25979..661a8d3 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -33,23 +33,6 @@
+ $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
fi
---- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200
-@@ -1 +1,13 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+c=$CC
-+
-+def=
-+so=
-+
-+opts='-O3'
-+
-+$c -s -c -Zomf -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+emxomfar rv liblpsolve55.lib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+echo liblpsolve55.a
-+
-+rm *.o 2>/dev/null
--- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005
+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008
@@ -1,8 +1,12 @@
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 408c6f0..21dca49 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -45,7 +45,7 @@ PATCH_FILES=lp_solve_5.5-windows.patch
PATCH_FILES=\
lp_solve_5.5.patch \
lp_solve-aix.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios
.ENDIF
.IF "$(OS)"=="OPENBSD"
@@ -76,9 +76,6 @@ BUILD_ACTION=cmd /c cvc6.bat
OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
.ENDIF
OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
-.ELIF "$(GUI)"=="OS2"
-BUILD_ACTION=sh ccc.os2
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib
.ELSE
.IF "$(OS)"=="MACOSX"
.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 131b1ee..20efead 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -101,11 +101,6 @@ BUILD_ACTION=dmake
OUT2INC += mythes.hxx
.ENDIF # "$(GUI)"=="WNT"
-.IF "$(GUI)"=="OS2"
-BUILD_ACTION=dmake
-OUT2INC += mythes.hxx
-.ENDIF # "$(GUI)"=="OS2"
-
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h
index 847675c..6db8c65 100644
--- a/np_sdk/mozsrc/jri_md.h
+++ b/np_sdk/mozsrc/jri_md.h
@@ -68,17 +68,7 @@ extern "C" {
/* DLL Entry modifiers... */
/* PC */
-#if defined(XP_OS2)
-# ifdef XP_OS2_VACPP
-# define JRI_PUBLIC_API(ResultType) ResultType _Optlink
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_CALLBACK
-# else
-# define JRI_PUBLIC_API(ResultType) ResultType
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_CALLBACK
-# endif
-#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
+#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
# include <windows.h>
# if defined(_MSC_VER) || defined(__MINGW32__)
# if defined(WIN32) || defined(_WIN32)
diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
index 1172a38..248cb6d 100644
--- a/np_sdk/mozsrc/makefile.mk
+++ b/np_sdk/mozsrc/makefile.mk
@@ -41,7 +41,7 @@ JDKINCS=
# --- Files --------------------------------------------------------
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
MOZFILES = $(SLO)$/npwin.obj
.ELSE
MOZFILES = $(SLO)$/npunix.obj
diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h
index af64042..e0863b1 100644
--- a/np_sdk/mozsrc/npapi.h
+++ b/np_sdk/mozsrc/npapi.h
@@ -45,18 +45,8 @@
#ifndef _NPAPI_H_
#define _NPAPI_H_
-#ifdef __OS2__
-#pragma pack(1)
-#endif
-
#include "jri.h" /* Java Runtime Interface */
-#if defined (__OS2__ ) || defined (OS2)
-# ifndef XP_OS2
-# define XP_OS2 1
-# endif /* XP_OS2 */
-#endif /* __OS2__ */
-
#ifdef _WINDOWS
# ifndef XP_WIN
# define XP_WIN 1
@@ -388,13 +378,6 @@ typedef struct _NPEvent
uint32 wParam;
uint32 lParam;
} NPEvent;
-#elif defined(XP_OS2)
-typedef struct _NPEvent
-{
- uint32 event;
- uint32 wParam;
- uint32 lParam;
-} NPEvent;
#elif defined (XP_UNIX) && !defined(NO_X11)
typedef XEvent NPEvent;
#else
@@ -521,12 +504,8 @@ enum NPEventType {
#if defined(_WINDOWS) && !defined(WIN32)
#define NP_LOADDS _loadds
#else
-#if defined(__OS2__)
-#define NP_LOADDS _System
-#else
#define NP_LOADDS
#endif
-#endif
#ifdef __cplusplus
extern "C" {
@@ -603,8 +582,5 @@ void NP_LOADDS NPN_ForceRedraw(NPP instance);
#endif
#endif /* RC_INVOKED */
-#ifdef __OS2__
-#pragma pack()
-#endif
#endif /* _NPAPI_H_ */
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h
index 9cf63e1..b2f9576 100644
--- a/np_sdk/mozsrc/npupp.h
+++ b/np_sdk/mozsrc/npupp.h
@@ -46,10 +46,6 @@
#ifndef _NPUPP_H_
#define _NPUPP_H_
-#if defined(__OS2__)
-#pragma pack(1)
-#endif
-
#ifndef GENERATINGCFM
#define GENERATINGCFM 0
#endif
@@ -1223,35 +1219,16 @@ typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, U
#if defined(_WINDOWS)
#define OSCALL WINAPI
#else
-#if defined(__OS2__)
-#define OSCALL _System
-#else
#define OSCALL
#endif
-#endif
-#if defined( _WINDOWS ) || defined (__OS2__)
+#if defined( _WINDOWS )
#ifdef __cplusplus
extern "C" {
#endif
/* plugin meta member functions */
-#if defined(__OS2__)
-
-typedef struct _NPPluginData { /* Alternate OS2 Plugin interface */
- char *pMimeTypes;
- char *pFileExtents;
- char *pFileOpenTemplate;
- char *pProductName;
- char *pProductDescription;
- unsigned long dwProductVersionMS;
- unsigned long dwProductVersionLS;
-} NPPluginData;
-
-NPError OSCALL NP_GetPluginData(NPPluginData * pPluginData);
-
-#endif
NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* pFuncs);
@@ -1265,11 +1242,7 @@ char* NP_GetMIMEDescription();
}
#endif
-#endif /* _WINDOWS || __OS2__ */
-
-#if defined(__OS2__)
-#pragma pack()
-#endif
+#endif /* _WINDOWS */
#ifdef XP_UNIX
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index 1fb4d3e..3c893b2 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -45,12 +45,6 @@
//\\// DEFINE
#define NP_EXPORT
-#ifdef OS2
-#define WINAPI _System
-#define HIBYTE(a) (a>>8)
-#define LOBYTE(a) (a&0xFF)
-#endif
-
//\\// GLOBAL DATA
NPNetscapeFuncs* g_pNavigatorFuncs = 0;
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 6fc9e4b..61d1e5a 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -67,10 +67,7 @@ OOO_PATCH_FILES += \
PATCH_FILES=$(OOO_PATCH_FILES)
-.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-.ELIF "$(OS)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
raptor_CC=$(CC) -mthreads
@@ -171,8 +168,6 @@ OUT2BIN+=src/raptor-config
.ELSE
# if we use dmake, this is done automagically
.ENDIF
-.ELIF "$(GUI)"=="OS2"
-# if we use dmake, this is done automagically
.ELSE
OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
OUT2BIN+=src/raptor-config
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 9956dac..2b09a4d 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -62,10 +62,7 @@ OOO_PATCH_FILES= \
PATCH_FILES=$(OOO_PATCH_FILES)
-.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-.ELIF "$(OS)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
rasqal_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
@@ -158,8 +155,6 @@ OUT2BIN+=src/rasqal-config
.ELSE
# if we use dmake, this is done automagically
.ENDIF
-.ELIF "$(OS)"=="OS2"
-# if we use dmake, this is done automagically
.ELSE
OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
OUT2BIN+=src/rasqal-config
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index cbe9b4e..f7c6f8a 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -62,10 +62,7 @@ OOO_PATCH_FILES= \
PATCH_FILES=$(OOO_PATCH_FILES) \
-.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/librdf
-.ELIF "$(OS)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
redland_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
@@ -159,8 +156,6 @@ OUT2BIN+=librdf$/.libs$/*.dll
.ELSE
# if we use dmake, this is done automagically
.ENDIF
-.ELIF "$(OS)"=="OS2"
-# if we use dmake, this is done automagically
.ELSE
OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR)
.ENDIF
diff --git a/unixODBC/inc/sqltypes.h b/unixODBC/inc/sqltypes.h
index 130de90..5bee0d6 100644
--- a/unixODBC/inc/sqltypes.h
+++ b/unixODBC/inc/sqltypes.h
@@ -75,11 +75,7 @@ extern "C" {
#define FAR
#define CALLBACK
-#ifdef __OS2__
-#define SQL_API _System
-#else
#define SQL_API
-#endif
#define BOOL int
typedef void* HWND;
typedef char CHAR;
commit 3082c500c619fc75c61962562c2eb6369d5b3d82
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 21 02:42:19 2011 +0300
Check OS_FOR_BUILD, not OS
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index d7888fc..91117d9 100644
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -49,7 +49,7 @@ PATCH_FILES=rhino1_5R5.patch \
rhino1_5R5-find_swing.patch \
rhino1_5R5-updateToolTip.patch
-.IF "$(OS)"=="WNT"
+.IF "$(OS_FOR_BUILD)"=="WNT"
FIXED_TARFILE_LOCATION=`cygpath -m -s "$(TARFILE_LOCATION)"`
.ELSE
FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
commit 9e515ebf86c5ecfdc60d9083d8f35fb5827f6357
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:39:02 2011 +0300
Add the wntgcc directories
diff --git a/.gitignore b/.gitignore
index dd87aeb..c2d7258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
/*/unxlng??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
/*/unxmac??
/*/unxmac??.pro
/*/unxios?
commit 3f3e444fca7720c0ac23d221db52feefa8ef7583
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:34:09 2011 +0300
Add the unxios and unxand directories
diff --git a/.gitignore b/.gitignore
index 9e0eab8..dd87aeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,10 @@
/*/wntmsc???.pro
/*/unxmac??
/*/unxmac??.pro
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
/external/*/*.dll
/external/*/*.txt
commit 4daaf07a6506d3bd0abc9b5b8e513ce6f8288d3a
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:27:36 2011 +0300
Build libtextcat for Android
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index 03385e8..0a2e5d7 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -1,5 +1,5 @@
---- misc/libtextcat-2.2/configure Thu May 22 13:39:55 2003
-+++ misc/build/libtextcat-2.2/configure Mon Mar 31 11:29:14 2008
+--- misc/build/libtextcat-2.2/configure
++++ misc/build/libtextcat-2.2/configure
@@ -3451,7 +3451,7 @@
;;
@@ -3897,7 +3897,7 @@
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
-@@ -1100,24 +1286,30 @@
+@@ -1100,24 +1286,31 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -3920,6 +3920,7 @@
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
++ | -androideabi* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index a6198c5..e1b480b 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -73,7 +73,13 @@ CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
BUILD_ACTION=make
+.IF "$(OS)"=="ANDROID"
+# The libtool in the libtextcat-2.2 tarball doesn't build
+# shared libraries on Android, for some reason.
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*.a
+.ELSE
OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST)
+.ENDIF
.ENDIF # "$(GUI)"=="UNX"
commit dff137c925051d3d2a647735352450feaf2f1a36
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu May 19 00:03:44 2011 +0300
Add forgotten quotes
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 072f625..2d25979 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -23,9 +23,9 @@
+else
+ so=so
+ soprefix=lib
-+ libs=-lc -lm -ldl
++ libs="-lc -lm -ldl"
+ pic=-fpic
-+ ldflags=-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so
++ ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
fi
@@ -19,3 +19,3 @@
- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
commit 37a91072d44e7673c169181ca85b964105d05575
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 18 03:29:26 2011 +0300
Add minor patch to libvisio makefile.mk
diff --git a/libvisio/libvisio-mingw-cross.patch b/libvisio/libvisio-mingw-cross.patch
new file mode 100644
index 0000000..0a29ff1
--- /dev/null
+++ b/libvisio/libvisio-mingw-cross.patch
@@ -0,0 +1,11 @@
+--- misc/build/libvisio-0.0.0/src/lib/makefile.mk
++++ misc/build/libvisio-0.0.0/src/lib/makefile.mk
+@@ -9,7 +9,7 @@
+
+ .INCLUDE : settings.mk
+
+-.IF "$(GUI)"=="WNT"
++.IF "$(COM)"=="MSC"
+ CFLAGS+=-GR
+ .ENDIF
+ .IF "$(COM)"=="GCC"
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 5da88ea..33708ba 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -56,6 +56,10 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
TARFILE_NAME=libvisio-0.0.0
TARFILE_MD5=763bb9b14eec5ba9a533d7a9279301db
+
+PATCH_FILES=\
+ libvisio-mingw-cross.patch
+
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
commit 1d5cea025e4397a19a6b36fdfc70b60a103096cc
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue May 17 23:01:24 2011 +0300
It's __declspec, not _declspec
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h
index f02dcf0..847675c 100644
--- a/np_sdk/mozsrc/jri_md.h
+++ b/np_sdk/mozsrc/jri_md.h
@@ -82,11 +82,11 @@ extern "C" {
# include <windows.h>
# if defined(_MSC_VER) || defined(__MINGW32__)
# if defined(WIN32) || defined(_WIN32)
-# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType
+# define JRI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType
# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) _declspec(dllexport) VarType
-# define JRI_PUBLIC_VAR_IMP(VarType) _declspec(dllimport) VarType
-# define JRI_NATIVE_STUB(ResultType) _declspec(dllexport) ResultType
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list