From 5bbdab11f6485ec64d93036f0bbfc5eda5842a9d Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 7 Jan 2012 15:19:56 +0100
Subject: split module targets' registration

---
 fpicker/Module_fpicker.mk | 52 +++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 7bb3a3420130..268280214466 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -33,28 +33,40 @@ $(eval $(call gb_Module_add_targets,fpicker,\
 	AllLangResTarget_fps_office \
 	Library_fpicker \
 	Library_fps_office \
-	$(if $(filter $(GUIBASE),aqua), \
-		Library_fps_aqua \
-	) \
-	$(if $(filter $(OS),WNT), \
-		Library_fps_odma \
-		Library_fop \
-		Library_fps \
-		Package_xml \
-		WinResTarget_fps \
-	) \
-	$(if $(filter $(GUIBASE),unx), \
-		$(if $(filter $(ENABLE_KDE),TRUE), \
-			Executable_kdefilepicker \
-			Library_fps_kde \
-		) \
-		$(if $(filter $(ENABLE_KDE4),TRUE), \
-			Library_fps_kde4 \
-			Package_kde4_moc \
-		) \
-	) \
 ))
 
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,fpicker,\
+	Library_fps_aqua \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,fpicker,\
+	Library_fps_odma \
+	Library_fop \
+	Library_fps \
+	Package_xml \
+	WinResTarget_fps \
+))
+endif
+
+ifeq ($(GUIBASE),unx)
+ifeq ($(ENABLE_KDE),TRUE)
+$(eval $(call gb_Module_add_targets,fpicker,\
+	Executable_kdefilepicker \
+	Library_fps_kde \
+))
+endif
+
+ifeq ($(ENABLE_KDE4),TRUE)
+$(eval $(call gb_Module_add_targets,fpicker,\
+	Library_fps_kde4 \
+	Package_kde4_moc \
+))
+endif
+endif
+
 endif
 
 # vim: set noet sw=4 ts=4:
-- 
cgit