From 9f72695e33093498e5957900e97817b78dba76c3 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 31 Mar 2011 12:30:31 -0700
Subject: uhd: added UHD_IMAGES_DIR option to include images in the package

---
 host/CMakeLists.txt |  9 +++++++++
 images/Makefile     | 18 +-----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 244793b9e..97b084572 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -207,6 +207,15 @@ ENDIF(ENABLE_UTILS)
 
 ADD_SUBDIRECTORY(usrp_e_utils)
 
+########################################################################
+# Handle pre-built images
+########################################################################
+IF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}")
+    FILE(GLOB _image_files "${UHD_IMAGES_DIR}/*.*")
+    MESSAGE(STATUS "Using images: ${_image_files}")
+    INSTALL(FILES ${_image_files} DESTINATION ${PKG_DATA_DIR}/images)
+ENDIF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}")
+
 ########################################################################
 # Print Summary
 ########################################################################
diff --git a/images/Makefile b/images/Makefile
index 74b1cd6e4..71b46d14e 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2010 Ettus Research LLC
+# Copyright 2010-2011 Ettus Research LLC
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -198,19 +198,3 @@ images: $(IMAGES_LIST)
 clean:
 	$(RM) -rf $(BUILT_IMAGES_DIR)
 	$(RM) -rf $(CMAKE_BUILD_DIR)
-
-#packages that a linux machine can build
-linux-packages:
-	mkdir -p $(CMAKE_BUILD_DIR)
-
-	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ $(TOP_DIR)
-	make -C $(CMAKE_BUILD_DIR) package
-
-	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP $(TOP_DIR)
-	make -C $(CMAKE_BUILD_DIR) package
-
-	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=DEB $(TOP_DIR)
-	make -C $(CMAKE_BUILD_DIR) package
-
-	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=RPM $(TOP_DIR)
-	make -C $(CMAKE_BUILD_DIR) package
-- 
cgit v1.2.3