[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-442-gc4a69b7

[Julien B a. A. <ar...@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  c4a69b796052698fadd47c745640de426d9052f9 (commit)
      from  04fd0e4216fa4e44c64c85bbd359966332a79d1a (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 c4a69b796052698fadd47c745640de426d9052f9
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 15 21:21:30 2010 +0200

    [AS_DEVICES] Cleanup makefiles and makes install targets work

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

Summary of changes:
 target/packages/as_devices/Makefile        |   32 ++++++++++++++--------------
 target/packages/as_devices/c/Makefile      |   20 ++++++++--------
 target/packages/as_devices/python/Makefile |   15 +++++++------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 3020fce..1d72f81 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -14,20 +14,20 @@ LDFLAGS=
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+INSTALL_DIR:=$(ARMADEUS_STAGING_DIR)
 
 C_BINARY=test_cdevices
-C_LIBNAME=as_devices
-C_LIB=c/lib$(C_LIBNAME).so
-C_INCLUDE=c/
+C_LIBNAME=libas_devices.so
+C_LIB=c/$(C_LIBNAME)
+C_INCLUDE=c
 
 P_WRAPPER=.python_wrappers
 
 CPP_BINARY=test_cppdevices
-CPP_LIBNAME=as_devices_cpp
-CPP_LIB=cpp/lib$(CPP_LIBNAME).so
-CPP_INCLUDE=cpp/
+CPP_LIBNAME=libas_devices_cpp.so
+CPP_LIB=cpp/$(CPP_LIBNAME)
+CPP_INCLUDE=cpp
 
-INSTALL_DIR=
 
 .PHONY: all
 
@@ -51,17 +51,17 @@ $(P_WRAPPER):
 	touch $(P_WRAPPER)
 
 install:
-	install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/
-	install -D $(C_INCLUDE)/*.h $(INSTALL_DIR)/usr/include/as_devices/
+	install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/$(C_LIBNAME)
+	mkdir -p $(INSTALL_DIR)/usr/include/as_devices/
+	cp $(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
+	install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/$(C_LIBNAME)
+	$(STRIP) $(INSTALL_DIR)/usr/lib/$(C_LIBNAME)
 
 clean:
-	cd c; make clean ;
-	-rm $(P_WRAPPER)
-	cd python; make clean
-	-rm $(C_BINARY) # $(CPP_BINARY)
+	make -C c/ clean
+	rm -f $(P_WRAPPER)
+	make -C python/ clean
+	rm -f $(C_BINARY) # $(CPP_BINARY)
 
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index e8c5e9d..0c25aa3 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -30,22 +30,22 @@ OBJ+= as_max5821.o
 
 LIBRARY=as_devices
 LIB_VERS=1
-STAT_LIB=${LIBRARY}.a
-SONAME=lib${LIBRARY}.so
-LIBNAME=${SONAME}.${LIB_VERS}
+STAT_LIB=$(LIBRARY).a
+SONAME=lib$(LIBRARY).so
+LIBNAME=$(SONAME).$(LIB_VERS)
 ARCHIVE_CMD=ar
 ARCHIVE_OPTS=-cvq
 
-${LIBNAME}: ${OBJ}
-	${CC} -shared -Wl,-soname,${SONAME} -o ${SONAME} ${OBJ} -lc 
-	ln -sf ${SONAME} ${LIBNAME}
+$(LIBNAME): $(OBJ)
+	$(CC) -shared -Wl,-soname,$(SONAME) -o $(SONAME) $(OBJ)
+	ln -sf $(SONAME) $(LIBNAME)
 
-${STAT_LIB}: ${OBJ} 
-	${ARCHIVE_CMD} ${ARCHIVE_OPTS} ${STAT_LIB} ${OBJ}
+$(STAT_LIB): $(OBJ)
+	$(ARCHIVE_CMD) $(ARCHIVE_OPTS) $(STAT_LIB) $(OBJ)
 
 %.o: %.c
-	$(CC) -fPIC -o $@ -c $< ${CFLAGS}
+	$(CC) -fPIC -o $@ -c $< $(CFLAGS)
 
 clean:
-	-rm ${OBJ} ${BINARY} ${LIBNAME} ${SONAME}
+	rm -f $(OBJ) $(BINARY) $(LIBNAME) $(SONAME)
 
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index 2b5e0ba..ecbfff3 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -27,19 +27,20 @@ WRAPPER_DIR=src
 PYTHON_VERS=2.4
 PYTHON_SUBVERS=5
 PYINC=/usr/include/python2.4
-PYLIB=../../../../buildroot/project_build_armv5te/apf27/root/usr/lib/python${PYTHON_VERS}
+PYLIB=../../../../buildroot/project_build_armv5te/apf27/root/usr/lib/python$(PYTHON_VERS)
 
 .PHONY: all
 
-all: ${WRAPPER_LIBS}
+all: $(WRAPPER_LIBS)
 
 %.so: %.o
-	${CC} -shared $< -o $@ -lc -L${PYLIB} ${AS_LIB}
-	mv $@ ${LIBNAME}/wrappers
+	$(CC) -shared $< -o $@ -L$(PYLIB) $(AS_LIB)
+	mv $@ $(LIBNAME)/wrappers
 	rm $<
 
-%.o : ${WRAPPER_DIR}/%.c
-	${CC} -fpic -o $@ -c $< ${CFLAGS} -L${PYLIB} -I${PYINC} -I${INCLUDE_LIB}
+%.o : $(WRAPPER_DIR)/%.c
+	$(CC) -fpic -o $@ -c $< $(CFLAGS) -L$(PYLIB) -I$(PYINC) -I$(INCLUDE_LIB)
 
 clean:
-	-rm ${LIBNAME}/wrappers/*.so
+	rm -f $(LIBNAME)/wrappers/*.so
+


hooks/post-receive
-- 
armadeus