[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-438-g18af8b3

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  18af8b3b2294445303e8be26eab2ed8f86268c37 (commit)
      from  e7ece475f346e212439d12fe591bf3af25f531ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 18af8b3b2294445303e8be26eab2ed8f86268c37
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 15 14:51:12 2010 +0200

    [as_devices] Makefile cleaning

-----------------------------------------------------------------------

Summary of changes:
 .../package/armadeus/as_devices/as_devices.mk      |    9 ++++++---
 target/packages/as_devices/Makefile                |   19 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 968b952..10d7db1 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -45,10 +45,13 @@ $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY): $(AS_DEVICES_DIR)/Makefile
 	#XXX: BR2_TARGET_UBOOT_BOARDNAME  is wrong, to be fixed
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(AS_DEVICES_DIR)/c ARMADEUS_BOARD_NAME=$(BR2_TARGET_UBOOT_BOARDNAME)
 
+# Install library on staging dir
+$(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY): $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY)
+	$(MAKE) INSTALL_DIR=$(STAGING_DIR) -C $(AS_DEVICES_DIR) install
+
 # install library on target
-$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY): $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY)
-	install -D $< $@
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
+$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY): $(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY)
+	$(MAKE) INSTALL_DIR=$(TARGET_DIR) STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" -C $(AS_DEVICES_DIR) install-exe
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_CPP)),y)
 $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 2169913..5a8cd78 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -17,16 +17,18 @@ STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
 
 C_BINARY=test_cdevices
 C_LIBNAME=as_devices
-C_LIB=c/lib${C_LIBNAME}.so.1
+C_LIB=c/lib${C_LIBNAME}.so
 C_INCLUDE=c/
 
 P_WRAPPER=.python_wrappers
 
 CPP_BINARY=test_cppdevices
 CPP_LIBNAME=as_devices_cpp
-CPP_LIB=cpp/lib${CPP_LIBNAME}.so.1
+CPP_LIB=cpp/lib${CPP_LIBNAME}.so
 CPP_INCLUDE=cpp/
 
+INSTALL_DIR=
+
 .PHONY: all
 
 all: ${C_BINARY} ${P_WRAPPER}
@@ -42,12 +44,21 @@ ${C_BINARY}: main.c test_c.h ${C_LIB}
 #	cd cpp; make CXX=${CXX}
 
 ${C_LIB}:
-	cd c; make
+	make -C c/
 
 ${P_WRAPPER}:
-	cd python; make
+	make -C python/
 	touch ${P_WRAPPER}
 
+install:
+	install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/
+	install -D $(C_INCLUDE)/*.h $(INSTALL_DIR)/usr/include/as_devices/
+
+install-exe:
+	mkdir -p $(INSTALL_DIR)/usr/lib
+	cp $(C_LIB) $(INSTALL_DIR)/usr/lib/
+	$(STRIP) $(INSTALL_DIR)/usr/lib/lib$(C_LIBNAME).so
+
 clean:
 	cd c; make clean ;
 	-rm ${P_WRAPPER}


hooks/post-receive
-- 
armadeus