From 8e535df765da3d4ab1733f7b5e50f20ce474016b Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Sat, 7 Apr 2012 13:59:33 +0200
Subject: group external headers together

---
 RepositoryExternal.mk | 61 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

(limited to 'RepositoryExternal.mk')

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
-- 
cgit