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

extensions: move mozilla to RepositoryExternal.mk

Browse Source
This commit is contained in:
Michael Stahl
2011-12-17 22:11:57 +01:00
parent a12ea5554b
commit be0b58bed5
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RepositoryExternal.mk
View File

@@ -901,6 +901,28 @@ endef
endif # SYSTEM_CURL endif # SYSTEM_CURL
ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
define gb_LinkTarget__use_mozilla_headers
$(eval $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(MOZILLA_HEADERS_CFLAGS)
))
endef
else #!SYSTEM_MOZILLA_HEADERS
define gb_LinkTarget__use_mozilla_headers
$(eval $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/npsdk \
))
endef
endif #SYSTEM_MOZILLA_HEADERS
#TODO np_sdk $(eval $(call gb_LinkTarget_add_external_headers,$(1),np_sdk))
# MacOSX-only frameworks ############################################ # MacOSX-only frameworks ############################################
# (in alphabetical order) # (in alphabetical order)

12
extensions/Library_npsoplugin.mk
View File

@@ -30,17 +30,7 @@
$(eval $(call gb_Library_Library,npsoplugin)) $(eval $(call gb_Library_Library,npsoplugin))
ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers))
$(eval $(call gb_Library_set_include,npsoplugin,\
$$(INCLUDE) \
$(MOZILLA_HEADERS_CFLAGS)
))
else
$(eval $(call gb_Library_set_include,npsoplugin,\
-I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \
))
endif
ifeq ($(GUI),UNX) ifeq ($(GUI),UNX)