mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

group external headers together

Browse Source
This commit is contained in:
Matúš Kukan
2012-04-07 13:59:33 +02:00
committed by David Tardon
parent 5eff0b6c58
commit 8e535df765
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
RepositoryExternal.mk
View File

@@ -36,18 +36,45 @@
# in the system case, no libraries should be registered, but the target-local # in the system case, no libraries should be registered, but the target-local
# variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS. # variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
# External headers
ifeq ($(SYSTEM_MESA_HEADERS),YES) ifeq ($(SYSTEM_MESA_HEADERS),YES)
gb_LinkTarget__use_Mesa:= gb_LinkTarget__use_mesa_headers :=
else else
define gb_LinkTarget__use_Mesa define gb_LinkTarget__use_mesa_headers
$(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc)) $(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc))
endef endef
endif endif
ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
define gb_LinkTarget__use_mozilla_headers
$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc))
$(eval $(call gb_LinkTarget_set_include,$(1),\
$(MOZILLA_HEADERS_CFLAGS) \
$$(INCLUDE) \
))
endef
else #!SYSTEM_MOZILLA_HEADERS
define gb_LinkTarget__use_mozilla_headers
$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc))
$(eval $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \
))
endef
endif #SYSTEM_MOZILLA_HEADERS
ifeq ($(SYSTEM_ODBC_HEADERS),YES) ifeq ($(SYSTEM_ODBC_HEADERS),YES)
define gb_LinkTarget__use_odbc_headers define gb_LinkTarget__use_odbc_headers
@@ -66,6 +93,8 @@ endef
endif endif
# External libraries
ifeq ($(SYSTEM_CPPUNIT),YES) ifeq ($(SYSTEM_CPPUNIT),YES)
define gb_LinkTarget__use_cppunit define gb_LinkTarget__use_cppunit
@@ -1093,31 +1122,17 @@ $(call gb_LinkTarget_set_include,$(1),\
) )
endef endef
ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) define gb_LinkTarget__use_gobject
$(call gb_LinkTarget_add_libs,$(1),\
$(GOBJECT_LIBS) \
)
define gb_LinkTarget__use_mozilla_headers $(call gb_LinkTarget_set_include,$(1),\
$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc))
$(eval $(call gb_LinkTarget_set_include,$(1),\
$(MOZILLA_HEADERS_CFLAGS) \
$$(INCLUDE) \ $$(INCLUDE) \
)) $(GOBJECT_CFLAGS) \
)
endef endef
else #!SYSTEM_MOZILLA_HEADERS
define gb_LinkTarget__use_mozilla_headers
$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc))
$(eval $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \
))
endef
endif #SYSTEM_MOZILLA_HEADERS
ifneq ($(VALGRIND_CFLAGS),) ifneq ($(VALGRIND_CFLAGS),)
define gb_LinkTarget__use_valgrind define gb_LinkTarget__use_valgrind

2
slideshow/Library_OGLTrans.mk
View File

@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Library_use_external,OGLTrans,Mesa)) $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers))
$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans))