diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 16:27:25 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 16:33:21 -0600 |
| commit | 1b61693a154bb9c2a2de5e2646893b087eb8f9f4 (patch) | |
| tree | 2d7c7f6d0845051c9df45cafb2bd497594c22be1 /RepositoryExternal.mk | |
| parent | c4c160a4519f20d50e7189ef92aac99b83c4cc6a (diff) | |
Enough with that...
peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess
reverting the whole mess for now...
to be resubmited when a bit less borked...
This reverts commit c4c160a4519f20d50e7189ef92aac99b83c4cc6a.
This reverts commit faef2e51d0c7b74334a11400b205daf382805780.
This reverts commit 057ce1fe2911f51be97199bf95e175db8aebfa42.
This reverts commit a7d34af344900233ba08aee2a56a3daf85ab2421.
This reverts commit befae0ceb80deb4623f3e41ff88b6dcb63eca0ad.
This reverts commit 433b43bcd2dbd146a9d6342fab0704d653c50d29.
This reverts commit 93e2c4a9d257ebbe794fbaba888229857e7c42d8.
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bbf352f31195..a1fc086a5990 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -878,6 +878,7 @@ gb_LinkTarget__use_graphite := endif # SYSTEM_GRAPHITE + ifeq ($(SYSTEM_ICU),YES) define gb_LinkTarget__use_icudata @@ -909,7 +910,7 @@ else gb_ICU_suffix:= endif -# icudata and icui18n is called icudt and icuin when built with MSVC :-/ +# icudata and icui18n is called icudt and icuin when built with MSVC :-( ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ @@ -1218,7 +1219,7 @@ ifeq ($(SYSTEM_LCMS2),YES) define gb_LinkTarget__use_lcms2 $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(LCMS2_CFLAGS) \ + $(LCMS2_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) @@ -1233,9 +1234,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_use_external_project,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ + -I$(OUTDIR)/inc/lcms2 \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -1251,17 +1251,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_use_external_project,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ + -I$(OUTDIR)/inc/lcms2 \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) - -endef - -define gb_ExternalProject__use_lcms2 -$(call gb_ExternalProject_use_package,$(1),lcms2) +$(call gb_LinkTarget_use_libraries,$(1),\ + lcms2 \ +) endef @@ -1271,11 +1267,8 @@ endif # SYSTEM_LCMS2 ifeq ($(SYSTEM_LPSOLVE),YES) -define gb_LinkTarget__use_lpsolve +define gb_LinkTarget__use_lpsolve55 $(call gb_LinkTarget_add_libs,$(1),-llpsolve55) -$(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_LPSOLVE \ -)) endef @@ -1285,14 +1278,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ lpsolve55 \ )) -define gb_LinkTarget__use_lpsolve +define gb_LinkTarget__use_lpsolve55 $(call gb_LinkTarget_use_libraries,$(1),\ lpsolve55 \ ) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,lpsolve) \ - $$(INCLUDE) \ -) endef |