diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-07 13:59:33 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:24:43 +0200 |
| commit | 8e535df765da3d4ab1733f7b5e50f20ce474016b (patch) | |
| tree | 5f9fafceee43077bf71727dfd01aa9667ba6157f /RepositoryExternal.mk | |
| parent | 5eff0b6c58c9a033e4794d9de76fcd777e49d09d (diff) | |
group external headers together
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 61 |
1 files changed, 38 insertions, 23 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 34b005e3cdd1..90dac4a174d6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -36,18 +36,45 @@ # 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. +# External headers + ifeq ($(SYSTEM_MESA_HEADERS),YES) -gb_LinkTarget__use_Mesa:= +gb_LinkTarget__use_mesa_headers := else -define gb_LinkTarget__use_Mesa +define gb_LinkTarget__use_mesa_headers $(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc)) + endef 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) define gb_LinkTarget__use_odbc_headers @@ -66,6 +93,8 @@ endef endif +# External libraries + ifeq ($(SYSTEM_CPPUNIT),YES) define gb_LinkTarget__use_cppunit @@ -1093,31 +1122,17 @@ $(call gb_LinkTarget_set_include,$(1),\ ) endef -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_gobject +$(call gb_LinkTarget_add_libs,$(1),\ + $(GOBJECT_LIBS) \ +) -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 \ +$(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -)) - + $(GOBJECT_CFLAGS) \ +) endef -endif #SYSTEM_MOZILLA_HEADERS - - ifneq ($(VALGRIND_CFLAGS),) define gb_LinkTarget__use_valgrind |