[Armadeus-commitlog] SF.net SVN: armadeus:[1033] trunk/buildroot/package/sdl

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

Revision: 1033
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1033&view=rev
Author:   artemys
Date:     2009-01-28 18:20:38 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
[BUILDROOT] Put sdlwater in the right place and install it correctly

Added Paths:
-----------
    trunk/buildroot/package/sdlwater/sdl_water.mk

Removed Paths:
-------------
    trunk/buildroot/package/sdl/sdl_water.mk

Deleted: trunk/buildroot/package/sdl/sdl_water.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl_water.mk	2009-01-28 17:03:12 UTC (rev 1032)
+++ trunk/buildroot/package/sdl/sdl_water.mk	2009-01-28 18:20:38 UTC (rev 1033)
@@ -1,62 +0,0 @@
-#############################################################
-#
-# SDL Water Demo
-#
-#############################################################
-SDL_WATER_VERSION:=1.0
-SDL_WATER_SOURCE:=water-$(SDL_WATER_VERSION).tar.gz
-SDL_WATER_SITE:=http://www.libsdl.org/projects/water/src/
-SDL_WATER_CAT:=$(ZCAT)
-SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
-
-$(DL_DIR)/$(SDL_WATER_SOURCE):
-	$(WGET) -P $(DL_DIR) $(SDL_WATER_SITE)/$(SDL_WATER_SOURCE)
-
-sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
-
-$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
-	$(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
-	(cd $(SDL_WATER_DIR); \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) " \
-	./configure \
-	--target=$(GNU_TARGET_NAME) \
-	--host=$(GNU_TARGET_NAME) \
-	--build=$(GNU_HOST_NAME) \
-	--prefix=$(STAGING_DIR)/usr \
-	--with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
-	--disable-video-x11 );
-	touch $@
-
-$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
-	$(MAKE) -C $(SDL_WATER_DIR)
-
-$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
-	$(MAKE) -C $(SDL_WATER_DIR) install
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
-	cp -dpf  $< $(SDL_WATER_DIR)/water320.bmp $(TARGET_DIR)/usr/bin/
-	-$(STRIPCMD) --strip-unneeded $@
-
-SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
-
-sdl-water-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
-	rm $(TARGET_DIR)/usr/bin/water320.bmp
-	-$(MAKE) -C $(SDL_WATER_DIR) clean
-
-sdl-water-dirclean:
-	rm -rf $(SDL_WATER_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
-TARGETS+=sdl-water
-endif

Copied: trunk/buildroot/package/sdlwater/sdl_water.mk (from rev 1027, trunk/buildroot/package/sdl/sdl_water.mk)
===================================================================
--- trunk/buildroot/package/sdlwater/sdl_water.mk	                        (rev 0)
+++ trunk/buildroot/package/sdlwater/sdl_water.mk	2009-01-28 18:20:38 UTC (rev 1033)
@@ -0,0 +1,65 @@
+#############################################################
+#
+# SDL Water Demo
+#
+#############################################################
+SDL_WATER_VERSION:=1.0
+SDL_WATER_SOURCE:=water-$(SDL_WATER_VERSION).tar.gz
+SDL_WATER_SITE:=http://www.libsdl.org/projects/water/src/
+SDL_WATER_CAT:=$(ZCAT)
+SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
+SDL_WATER_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share/images/
+
+$(DL_DIR)/$(SDL_WATER_SOURCE):
+	$(WGET) -P $(DL_DIR) $(SDL_WATER_SITE)/$(SDL_WATER_SOURCE)
+
+sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
+
+$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
+	$(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $@
+
+$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
+	(cd $(SDL_WATER_DIR); \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS) " \
+	./configure \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--prefix=$(STAGING_DIR)/usr \
+	--with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
+	--disable-video-x11 );
+	touch $@
+
+$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
+	$(MAKE) -C $(SDL_WATER_DIR)
+
+$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
+	$(MAKE) -C $(SDL_WATER_DIR) install
+	touch -c $@
+
+$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
+	mkdir -p $(SDL_WATER_TARGET_DATA_DIR)
+	cp -dpf $(SDL_WATER_DIR)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/
+	cp -dpf  $< $(TARGET_DIR)/usr/bin/
+	-$(STRIPCMD) $@
+
+SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
+
+sdl-water-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
+	rm $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
+	-$(MAKE) -C $(SDL_WATER_DIR) clean
+
+sdl-water-dirclean:
+	rm -rf $(SDL_WATER_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
+TARGETS+=sdl-water
+endif


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