diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-01 20:49:35 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 09:55:38 +0200 |
| commit | c74af0d73c175cdc9aab3740d32b541d0e907052 (patch) | |
| tree | 3e2629938a3f60ee8663a563b9730191f6e2425b /Repository.mk | |
| parent | fa0e0b9416c23ce14f222f443f7704077f20afc0 (diff) | |
gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]
Diffstat (limited to 'Repository.mk')
| -rwxr-xr-x | Repository.mk | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/Repository.mk b/Repository.mk index 0ea7d9b53fc5..0a4f00c9c355 100755 --- a/Repository.mk +++ b/Repository.mk @@ -100,18 +100,14 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - xml2 \ xmlreader \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cppunit \ - icuuc \ icule \ graphite_dll \ cppunit \ - rdf \ - xslt \ )) @@ -161,23 +157,11 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ basegfx_s \ - jpeglib \ + graphite \ ooopathutils \ salcpprt \ + vclmain \ zlib \ - graphite \ - vclmain \ )) -ifeq ($(SYSTEM_EXPAT),YES) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ - expat \ -)) -else -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - expat_xmlparse \ - expat_xmltok \ -)) -endif - # vim: set noet sw=4 ts=4: |