From 5230adfd63cba205c01879a8116187f065e4f4f2 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Mon, 7 Sep 2015 12:05:08 +0200
Subject: [PATCH] wifi: pseudo library to install firmware

The patch prevents linking wifi_drv on each build.
---
 repos/dde_linux/lib/mk/iwl_firmware.mk     | 14 ++++++++++++++
 repos/dde_linux/src/drivers/wifi/target.mk | 12 +-----------
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 repos/dde_linux/lib/mk/iwl_firmware.mk

diff --git a/repos/dde_linux/lib/mk/iwl_firmware.mk b/repos/dde_linux/lib/mk/iwl_firmware.mk
new file mode 100644
index 000000000..a6ce72a98
--- /dev/null
+++ b/repos/dde_linux/lib/mk/iwl_firmware.mk
@@ -0,0 +1,14 @@
+#
+# Pseudo library to copy Intel Wireless firmware to build directory
+#
+
+WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)
+
+IMAGES  := $(notdir $(wildcard $(WIFI_CONTRIB_DIR)/firmware/*.ucode))
+BIN_DIR := $(BUILD_BASE_DIR)/bin
+FW_DIR  := $(WIFI_CONTRIB_DIR)/firmware
+
+all: $(addprefix $(BIN_DIR)/,$(IMAGES))
+
+$(BIN_DIR)/%.ucode: $(FW_DIR)/%.ucode
+	$(VERBOSE)cp $^ $@
diff --git a/repos/dde_linux/src/drivers/wifi/target.mk b/repos/dde_linux/src/drivers/wifi/target.mk
index b5c5e85ee..d2be620e6 100644
--- a/repos/dde_linux/src/drivers/wifi/target.mk
+++ b/repos/dde_linux/src/drivers/wifi/target.mk
@@ -1,16 +1,6 @@
 TARGET   = wifi_drv
 SRC_CC   = main.cc
-LIBS     = wifi wpa_supplicant server
+LIBS     = wifi iwl_firmware wpa_supplicant server
 
 # needed for firmware.h
 INC_DIR += $(REP_DIR)/src/lib/wifi/include
-
-#
-# Copy all firmware images to the build directory
-#
-WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)
-$(TARGET): firmware_images
-firmware_images:
-	$(VERBOSE)for img in $(WIFI_CONTRIB_DIR)/firmware/*.ucode; do \
-		cp $$img $(PWD)/bin; \
-	done