diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
| commit | 6f0d3f2a5b72673086f82a88831535e535885998 (patch) | |
| tree | 95f35abd15a9842442e432cd064aea92288393d3 /Repository.mk | |
| parent | 01a601fb2a7a3872599186ffb8c4c4be1500e678 (diff) | |
fixing rebase errors
Diffstat (limited to 'Repository.mk')
| -rwxr-xr-x | Repository.mk | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Repository.mk b/Repository.mk index ad76593919f9..c60677f27bbe 100755 --- a/Repository.mk +++ b/Repository.mk @@ -178,26 +178,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ooopathutils \ salcpprt \ vclmain \ - zlib \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - crypto \ - ssl \ -)) -else -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - crypto \ - ssl \ -)) -endif - -ifeq ($(SYSTEM_OPENSSL),YES) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ - crypto \ - ssl \ -)) -endif - # vim: set noet sw=4 ts=4: |