[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-439-g730d043
Brought to you by:
sszy
|
From: Fabien M <fa...@us...> - 2010-06-15 12:55:23
|
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 730d043a78c26d65770df895026f3696038ca5b1 (commit)
from 18af8b3b2294445303e8be26eab2ed8f86268c37 (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 730d043a78c26d65770df895026f3696038ca5b1
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 15 14:54:54 2010 +0200
[as_devices] {} replaced by () in Makefiles
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
target/packages/as_devices/Makefile | 30 ++++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 10d7db1..1476a98 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -23,7 +23,7 @@ AS_DEVICES_CPP_TARGET_BINARY:=$(AS_DEVICES_CPP_TARGET_DIR)/$(AS_DEVICES_CPP_BINA
# Python wrapper variables
AS_DEVICES_PYTHON_BINARY:=AsGpio_wrap.so
AS_DEVICES_PYTHON_MODULE:=AsDevices
-AS_DEVICES_PYTHON_TARGET_DIR:=usr/lib/${PYTHON}/
+AS_DEVICES_PYTHON_TARGET_DIR:=usr/lib/$(PYTHON)/
AS_DEVICES_PYTHON_TARGET_BINARY:=$(AS_DEVICES_PYTHON_TARGET_DIR)/$(AS_DEVICES_PYTHON_MODULE)
AS_DEVICES_BINARIES=$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 5a8cd78..3020fce 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -17,38 +17,38 @@ STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
C_BINARY=test_cdevices
C_LIBNAME=as_devices
-C_LIB=c/lib${C_LIBNAME}.so
+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
+CPP_LIB=cpp/lib$(CPP_LIBNAME).so
CPP_INCLUDE=cpp/
INSTALL_DIR=
.PHONY: all
-all: ${C_BINARY} ${P_WRAPPER}
- #${CPP_BINARY}
+all: $(C_BINARY) $(P_WRAPPER)
+ #$(CPP_BINARY)
-${C_BINARY}: main.c test_c.h ${C_LIB}
- ${CC} ${CFLAGS} main.c ${C_LIB} -o ${C_BINARY} -I${C_INCLUDE} -lm
+$(C_BINARY): main.c test_c.h $(C_LIB)
+ $(CC) $(CFLAGS) main.c $(C_LIB) -o $(C_BINARY) -I$(C_INCLUDE) -lm
-#${CPP_BINARY}: main.c test_cpp.h ${CPP_LIB} ${C_LIB}
-# ${CXX} ${CFLAGS} main.c ${C_LIB} ${CPP_LIB} -I${C_INCLUDE} -I${CPP_INCLUDE} -o ${CPP_BINARY}
+#$(CPP_BINARY): main.c test_cpp.h $(CPP_LIB) $(C_LIB)
+# $(CXX) $(CFLAGS) main.c $(C_LIB) $(CPP_LIB) -I$(C_INCLUDE) -I$(CPP_INCLUDE) -o $(CPP_BINARY)
#
-#${CPP_LIB}: ${C_LIB}
-# cd cpp; make CXX=${CXX}
+#$(CPP_LIB): $(C_LIB)
+# cd cpp; make CXX=$(CXX)
-${C_LIB}:
+$(C_LIB):
make -C c/
-${P_WRAPPER}:
+$(P_WRAPPER):
make -C python/
- touch ${P_WRAPPER}
+ touch $(P_WRAPPER)
install:
install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/
@@ -61,7 +61,7 @@ install-exe:
clean:
cd c; make clean ;
- -rm ${P_WRAPPER}
+ -rm $(P_WRAPPER)
cd python; make clean
- -rm ${C_BINARY} # ${CPP_BINARY}
+ -rm $(C_BINARY) # $(CPP_BINARY)
hooks/post-receive
--
armadeus
|