[Armadeus-commitlog] SF.net SVN: armadeus: [639] trunk/buildroot/package/slideshow/slideshow.mk

[<ar...@us...>]

Revision: 639
          http://armadeus.svn.sourceforge.net/armadeus/?rev=639&view=rev
Author:   artemys
Date:     2007-09-07 14:50:01 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
[BUILDROOT] Slideshow tool is now installed in rootfs when built

Modified Paths:
--------------
    trunk/buildroot/package/slideshow/slideshow.mk

Modified: trunk/buildroot/package/slideshow/slideshow.mk
===================================================================
--- trunk/buildroot/package/slideshow/slideshow.mk	2007-09-06 10:04:39 UTC (rev 638)
+++ trunk/buildroot/package/slideshow/slideshow.mk	2007-09-07 21:50:01 UTC (rev 639)
@@ -7,7 +7,7 @@
 SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
 SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
 SLIDESHOW_CAT:=zcat
-SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow/
+SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
 
 $(DL_DIR)/$(SLIDESHOW_SOURCE):
 	$(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
@@ -23,25 +23,17 @@
 	toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
 	touch $@
 
-$(SLIDESHOW_DIR)/src/slideshow: $(SLIDESHOW_DIR)/.configured
+$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
 	export PATH=$(STAGING_DIR)/bin::$$PATH; $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
 
-$(STAGING_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/src/slideshow
-	$(MAKE) -C $(SLIDESHOW_DIR) install
+$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
+	cp -dpf $< $(TARGET_DIR)/usr/bin
+	-$(STRIP) --strip-unneeded $@
 
-# $(TARGET_DIR)/usr/games/prboom: $(STAGING_DIR)/usr/games/$(GNU_TARGET_NAME)-prboom
-# 	mkdir -p $(TARGET_DIR)/usr/games/
-# 	mkdir -p $(TARGET_DIR)/usr/share/games/doom/
-# 	cp -dpf $(STAGING_DIR)/usr/games/$(GNU_TARGET_NAME)-prboom $@
-# 	cp -dpf $(SLIDESHOW_DIR)/data/*.wad $(TARGET_DIR)/usr/share/games/doom/ 
-# 	-$(STRIP) --strip-unneeded $@
+SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
 
-SLIDESHOW slideshow: sdl sdl_image $(STAGING_DIR)/usr/bin/slideshow
-
 slideshow-clean:
-#	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SLIDESHOW_DIR) uninstall
-#	rm -rf $(TARGET_DIR)/usr/share/games/doom/
-#	rm -rf $(TARGET_DIR)/usr/games/
+	rm -f $(TARGET_DIR)/usr/bin/slideshow
 	-$(MAKE) -C $(SLIDESHOW_DIR) clean
  
 slideshow-dirclean:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.