Kaydet (Commit) ce74c673 authored tarafından David Tardon's avatar David Tardon Kaydeden (comit) Fridrich Štrba

always provide REDLAND_CFLAGS/LIBS to ext. projects

Change-Id: Iad1004503e91fbaf6251edc50b20d89ddbb15efa
üst 1e228888
...@@ -1784,7 +1784,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ ...@@ -1784,7 +1784,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
define gb_LinkTarget__use_revenge define gb_LinkTarget__use_revenge
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \ $(REVENGE_CFLAGS) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
...@@ -1808,11 +1808,11 @@ define gb_LinkTarget__use_revenge ...@@ -1808,11 +1808,11 @@ define gb_LinkTarget__use_revenge
$(call gb_LinkTarget_use_package,$(1),librevenge) $(call gb_LinkTarget_use_package,$(1),librevenge)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \ $(REVENGE_CFLAGS) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,librevenge)/src/lib/.libs -lrevenge-0.0 \ $(REVENGE_LIBS) \
) )
endef endef
......
...@@ -7665,7 +7665,11 @@ AC_SUBST([ENABLE_EOT]) ...@@ -7665,7 +7665,11 @@ AC_SUBST([ENABLE_EOT])
dnl =================================================================== dnl ===================================================================
dnl Check for system librevenge dnl Check for system librevenge
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0]) AS_IF([test "$COM" = "MSC"],
[librevenge_libdir="${WORKDIR}/LinkTarget/Library"],
[librevenge_libdir="${WORKDIR}/UnpackedTarball/lirevenge/src/lib/.libs"]
)
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]),
dnl =================================================================== dnl ===================================================================
dnl Check for system libe-book dnl Check for system libe-book
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment