summaryrefslogtreecommitdiffstats
path: root/Library_merged.mk
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Rename Boost libraries when built internally to match conventions"Fridrich Štrba2013-05-241-1/+1
| | | | This reverts commit 3aeecc525c76797801e9e2b24c2ebff6ac81adac.
* Rename Boost libraries when built internally to match conventionsTor Lillqvist2013-05-241-1/+1
| | | | | | | | | | | | | The standard Boost convention is for them to be called libboost_date_time and libboost_system (with apropriate suffix then depending on type). Did not touch the libboostthread library we build for Windows. Add the ax_boost_thread.m4 file for completeness and possible use. Document where the ax_boost*.m4 files come from. Change-Id: Ib49bee71398d62c9760a1f8fd5c46be9f3400430
* libmerged needs -lrt tooMatúš Kukan2013-05-231-0/+1
| | | | | | since 9830fd36dbdb72c79703b0c61efc027fba793c5a Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976
* Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks2013-04-301-17/+4
|
* ditch libi18nlangtagicu againEike Rathke2013-04-251-1/+0
| | | | | | | Thanks to Fridrich for finding the real cause for why I thought this was necessary.. Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
* introduced libi18nlangtagicuEike Rathke2013-04-241-0/+1
| | | | Change-Id: Ie80e989d55d465e127ccc20290d654acf222e5bb
* libmerged: add harfbuzz externalMatúš Kukan2013-04-231-0/+1
| | | | Change-Id: I7be27b049c4a482be256544c295a7aee89f81f57
* add a bunch more libs to libmergedPeter Foley2013-04-151-0/+5
| | | | Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
* add extensions libs to libmergedPeter Foley2013-04-151-0/+1
| | | | Change-Id: I65a4358c3214c43714bc0d13a05a316799cafb24
* libmerged: add more libraries and cleanupMatúš Kukan2013-04-151-49/+7
| | | | Change-Id: I68c6f4d4bae3ae495dd2033c95f47a34a4aba560
* libmerged: fix linking against cppunit againMatúš Kukan2013-04-151-3/+8
| | | | | | | | Fix for: ./program/soffice.bin: error while loading shared libraries: libcppunit-1.13.so.0: cannot open shared object file: No such file or directory Change-Id: Ib73010f69c7fcab0e5759df9e77e0848aa80579f
* add filter libs to libmergedPeter Foley2013-04-141-1/+2
| | | | Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585
* add tl and basegfx to libmergedPeter Foley2013-04-131-2/+0
| | | | Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd
* fix mergelibs=allPeter Foley2013-04-131-0/+2
| | | | Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
* No jvmaccess or jvmfwk library unless SOLAR_JAVATor Lillqvist2013-04-121-2/+3
| | | | Change-Id: I676c1305d997d756456245264e68676666f75c7e
* libmerged: remove some of unused externals and static librariesMatúš Kukan2013-04-091-24/+0
| | | | | | | Because cppunit was causing troubles. It's not in installation, to be used at run-time, so we can't link against it. Change-Id: I133feb0c3dab50bacbe96775a28dd1a61f09882e
* fix linking of libmerged: add jvmaccessMatúš Kukan2013-04-091-1/+2
| | | | Change-Id: I374041bba8ea4f20d22aeea8b486f68b0d7acd7b
* Revert "add javavm and jvmfwk to Library_merged"Matúš Kukan2013-04-091-0/+1
| | | | | | | | | This reverts commit 77169b9ceccfedeadef272f701425430cf1c719d. Conflicts: Library_merged.mk Change-Id: Id7c42457127a622cf71910bafc97f69db545243f
* rename expat external to 'expat'David Tardon2013-04-091-1/+1
| | | | | | | expat_utf16 is long gone, so there is no need to fool around with expat_utf8. Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89
* new module i18nlangtagEike Rathke2013-04-051-1/+1
| | | | | | | | | | | Moved portions from module i18npool, all of former i18nisolang1 library that now is i18nlangtag. Included are languagetag, isolang and mslangid. This i18nlangtag code is now even used by module comphelper, so disentangling i18npool and making this an own module was needed to not create circular module dependencies. Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015
* fix vcl with Library_mergedPeter Foley2013-03-311-3/+0
| | | | Change-Id: Ie85ba53c59eda5586b70527a518e3f80223fc49e
* add tl dependent libs to Library_mergedPeter Foley2013-03-281-0/+4
| | | | Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418
* add pyuno and pythonloader to Library_mergedPeter Foley2013-03-281-0/+1
| | | | Change-Id: Ib2bde93f7f99873c4c2f4d3857bb1ed5e3e7fd8a
* add javaloader, java_uno, juh, and jvmaccess to Library_mergedPeter Foley2013-03-281-6/+0
| | | | Change-Id: I9841860d7c7d34310b99ee339d7835e909702d4f
* add lingucomponent libs to Library_mergedPeter Foley2013-03-281-22/+11
| | | | Change-Id: Ib34f589b377991b9e2d043d43ecf0360031ddae3
* add javavm and jvmfwk to Library_mergedPeter Foley2013-03-281-1/+0
| | | | Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6
* add helplinker to Library_mergedPeter Foley2013-03-281-0/+3
| | | | Change-Id: I33073859403edf11576fd88db6a68279f9055139
* add basebmp and unotest to Library_mergedPeter Foley2013-03-281-13/+8
| | | | Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84
* add desktop_detector, subsequenttest, test, and vclplug_svp to Library_mergedPeter Foley2013-03-281-0/+15
| | | | Change-Id: Ic2201436d1e4fe01670e2086e7dd1c6c525c9e91
* add scfilt to Library_mergedPeter Foley2013-03-241-0/+1
| | | | Change-Id: Icebffb82b35ae383b97b0ef4b3419b1fe74ce858
* cleanup Library_mergedPeter Foley2013-03-231-10/+2
| | | | Change-Id: Iedd2a60ab6287ed661de7a88daf182cf2af4fe86
* add wpftdraw to Library_mergedPeter Foley2013-03-211-1/+3
| | | | Change-Id: I40471e76a338430e010ad53f64aa6328f3c81b44
* add oox sd and xmlsecurity to Library_mergedPeter Foley2013-03-211-0/+1
| | | | Change-Id: Ie9ef511308179902cbaeb2cca39414e86c57ce30
* add wpftwriter to Library_mergedPeter Foley2013-03-211-0/+12
| | | | Change-Id: Id748b3bb2347bf8e8d63a47ff8471e3185cbedcb
* RepositoryExternal.mk: clean up awful icudata/icui18n duplicationMichael Stahl2012-12-021-7/+1
| | | | Change-Id: Ic4794d9a908b60220a4a849ff263eaa08776550c
* dung out berkeleydb gnumake / configure bits ...Michael Meeks2012-11-211-6/+0
|
* drop glib external from mergedlibDavid Tardon2012-11-071-1/+0
| | | | Change-Id: Id5f1410ee578cdd528d3c61c4822faf4ba41d037
* prevent libmerged warning spamPeter Foley2012-10-071-0/+5
| | | | Change-Id: I8ee74175d3dc08318461dfe08ebd10b12ce8d814
* add support for libmerged on WindowsPeter Foley2012-10-071-1/+8
| | | | Change-Id: I05d1c557967000be2fb7128b43d6e8c6005a7892
* gbuild: invert handling of standard system libraries:Michael Stahl2012-09-281-2/+0
| | | | | | | Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
* gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:Michael Stahl2012-09-281-2/+2
| | | | | | | add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
* gbuild: gb_Library_PLAINLIBS_NONE cleanup for MacMichael Stahl2012-09-281-5/+7
| | | | Change-Id: I66f8229e186e312ed3242695db9ef0768ab4d9a0
* gbuild: clean up Mac OS X framework handling:Michael Stahl2012-09-281-9/+9
| | | | | | | | | | | There are currently 3 different mechanisms being used for frameworks, which is of course intolerable so we invent a 4th one and standardize on it: gb_LinkTarget_use_darwin_frameworks (This doesn't mean using add_libs or externals was wrong, it was just inconsistent... and i don't see an obvious benefit of using externals here) Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d
* gbuild: replace direct gb_STDLIBS use with ...Michael Stahl2012-09-281-1/+2
| | | | | | ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
* gbuild: split uwinapi out of gb_STDLIBSMichael Stahl2012-09-281-0/+1
| | | | Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7
* libmerged: use external cupsMatúš Kukan2012-09-191-0/+1
| | | | Change-Id: I1380fe8053ddf68a81b1bf6ffc8febfbb5ed9214
* dbus for libmergedCaolán McNamara2012-09-041-0/+6
| | | | Change-Id: I7a0b2c5358ff1b003f822ef4f9acc5c78b1605b1
* libmerged: another small component libraries for androidMatúš Kukan2012-09-011-1/+2
| | | | Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad
* merge more, mostly small libraries for androidMatúš Kukan2012-08-251-0/+14
| | | | Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0
* libmerged: add more librariesMatúš Kukan2012-08-251-3/+9
| | | | Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05