summaryrefslogtreecommitdiff
path: root/cleopatre/application
diff options
context:
space:
mode:
authorOlivier Dufour2012-11-20 11:20:57 +0100
committerOlivier Dufour2012-11-30 08:42:01 +0100
commit97d1110f3d961799fb84e7e73dd4a8096e4e3f31 (patch)
treed98e0d22ab10ad34c8ca8fd80ecc485f854366bf /cleopatre/application
parent2ae58ed12a10ac1f02e7be4542911d01a1346a84 (diff)
cleo/app: update applications to use the response file, closes #3416
Diffstat (limited to 'cleopatre/application')
-rw-r--r--cleopatre/application/afe/Makefile7
-rwxr-xr-xcleopatre/application/config_to_header33
-rw-r--r--cleopatre/application/cwmp/Makefile7
-rw-r--r--cleopatre/application/fw_wd/Makefile5
-rw-r--r--cleopatre/application/igmp_snoopd/Makefile7
-rw-r--r--cleopatre/application/libmme/Makefile3
-rw-r--r--cleopatre/application/libspid/Makefile7
-rw-r--r--cleopatre/application/lltd/Makefile5
-rw-r--r--cleopatre/application/managerd/Makefile18
l---------cleopatre/application/managerd/config_to_header1
-rw-r--r--cleopatre/application/managerd/src/gpio_event.c1
-rw-r--r--cleopatre/application/spidapp/Makefile13
-rw-r--r--cleopatre/application/spidinit/Makefile9
-rw-r--r--cleopatre/application/upnpd/Makefile7
14 files changed, 56 insertions, 67 deletions
diff --git a/cleopatre/application/afe/Makefile b/cleopatre/application/afe/Makefile
index 705328d3c3..0aad30e353 100644
--- a/cleopatre/application/afe/Makefile
+++ b/cleopatre/application/afe/Makefile
@@ -3,16 +3,19 @@ OBJPATH=obj
SRCPATH=src
INCPATH=.
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LINUX_DIR=../../linux-2.6.25.10-spc300
+LINUX_DIR=$(CLEO_BASE)/linux-2.6.25.10-spc300
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include -MMD
+EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include -MMD @$(CLEO_BASE)/$(RESPONSE_FILE)
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
diff --git a/cleopatre/application/config_to_header b/cleopatre/application/config_to_header
deleted file mode 100755
index 8d8c4ee9f2..0000000000
--- a/cleopatre/application/config_to_header
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-# Takes a config file and generates the corresponding ".h" header file.
-
-if [ $# -lt 3 ]
-then
- echo "Usage: $0 input_config_file output_header_file header_guard"
- exit 1
-fi
-
-# The input config file
-config="$1"
-
-# The path and name of the output header file.
-header="$2"
-
-# The name of the macro to use as a guard for the output header file.
-guard="$3"
-
-echo \
-"#ifndef ${guard}
-#define ${guard}
-" > "${header}"
-
-sed -r \
- -e "/^#/d" \
- -e "s/^CONFIG_(.*)=y/#define CONFIG_\1 1/" \
- -e "/^CONFIG_(.*)=n/d" \
- -e "s/^CONFIG_(.*)=(.*)/#define CONFIG_\1 \2/" \
- "${config}" >> "${header}"
-
-echo "
-#endif /* ${guard} */" >> ${header}
diff --git a/cleopatre/application/cwmp/Makefile b/cleopatre/application/cwmp/Makefile
index edb2c83660..9e68eb6970 100644
--- a/cleopatre/application/cwmp/Makefile
+++ b/cleopatre/application/cwmp/Makefile
@@ -4,6 +4,9 @@ SRCPATH=src
INCPATH=inc
LIBPATH=lib
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
AVS_PATH=avsystem_libcwmp-3.0.13-arm-linux
AVS_INCPATH=$(AVS_PATH)/include
AVS_LIBPATH=$(AVS_PATH)/lib
@@ -13,13 +16,13 @@ ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LIBSPID_DIR=../libspid
+LIBSPID_DIR=$(CLEO_BASE)/application/libspid
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(AVS_INCPATH) -I../../include -I$(LIBSPID_DIR)/inc -MMD -Wall
+EXTRA_CFLAGS=-I$(INCPATH) -I$(AVS_INCPATH) -I../../include -I$(LIBSPID_DIR)/inc -MMD -Wall @$(CLEO_BASE)/$(RESPONSE_FILE)
LIBS=-L$(LIBPATH) -L$(AVS_LIBPATH) -L$(LIBSPID_DIR) -lcwmp -lpthread -lspid
ifdef DEMO_SHELL
diff --git a/cleopatre/application/fw_wd/Makefile b/cleopatre/application/fw_wd/Makefile
index e2feb09561..3faa9bb5d8 100644
--- a/cleopatre/application/fw_wd/Makefile
+++ b/cleopatre/application/fw_wd/Makefile
@@ -3,6 +3,9 @@ OBJPATH=obj
SRCPATH=src
INCPATH=.
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
@@ -11,7 +14,7 @@ else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -MMD
+EXTRA_CFLAGS=-I$(INCPATH) -MMD @$(CLEO_BASE)/$(RESPONSE_FILE)
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
diff --git a/cleopatre/application/igmp_snoopd/Makefile b/cleopatre/application/igmp_snoopd/Makefile
index 27e02040d4..1d3f555fb4 100644
--- a/cleopatre/application/igmp_snoopd/Makefile
+++ b/cleopatre/application/igmp_snoopd/Makefile
@@ -3,17 +3,20 @@ OBJPATH=obj
SRCPATH=src
INCPATH=inc
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LIBSPID_DIR=../libspid
+LIBSPID_DIR=$(CLEO_BASE)/application/libspid
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I../../include -I$(LIBSPID_DIR)/inc -MMD -Wall -Wextra -Wstrict-prototypes -Winline
+EXTRA_CFLAGS=-I$(INCPATH) -I$(CLEO_BASE)/include -I$(LIBSPID_DIR)/inc -MMD -Wall -Wextra -Wstrict-prototypes -Winline @$(CLEO_BASE)/$(RESPONSE_FILE)
LIBS=-lm -lrt -L$(LIBSPID_DIR) -lspid
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
diff --git a/cleopatre/application/libmme/Makefile b/cleopatre/application/libmme/Makefile
index d45266d0a6..f6029b5e39 100644
--- a/cleopatre/application/libmme/Makefile
+++ b/cleopatre/application/libmme/Makefile
@@ -1,5 +1,6 @@
BASE = ../..
LINUX_DIR=$(BASE)/linux-2.6.25.10-spc300
+RESPONSE_FILE=extra_flags
STAT_LIB=libmme.a
DYN_LIB=libmme.so
@@ -16,7 +17,7 @@ else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(BASE)/include -I$(LINUX_DIR)/include -MMD
+EXTRA_CFLAGS=-I$(INCPATH) -I$(BASE)/include -I$(LINUX_DIR)/include -MMD @$(BASE)/$(RESPONSE_FILE)
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
DYN_OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.dyn.o))
diff --git a/cleopatre/application/libspid/Makefile b/cleopatre/application/libspid/Makefile
index a645c99d92..d1e3d04bfc 100644
--- a/cleopatre/application/libspid/Makefile
+++ b/cleopatre/application/libspid/Makefile
@@ -6,15 +6,16 @@ DYN_LIB=libspid.so
OBJPATH=obj
SRCPATH=src
INCPATH=inc
-LIBMME=../libmme
+LIBMME=$(BASE)/application/libmme
+RESPONSE_FILE=extra_flags
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
AR=arm-linux-ar
-CC_WITH_CFLAGS=$(CC) -g -Os
+CC_WITH_CFLAGS=$(CC) -g -Os @$(BASE)/$(RESPONSE_FILE)
CC_WITHOUT_CFLAGS=$(CC)
else #compile from buildroot
-CC_WITH_CFLAGS=$(CC)
+CC_WITH_CFLAGS=$(CC) @$(BASE)/$(RESPONSE_FILE)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
INCLUDES=-I$(INCPATH) -I$(BASE)/include -I$(LINUX_DIR)/include -MMD -I$(LINUX_DIR)/include/asm-arm/arch-spc300
diff --git a/cleopatre/application/lltd/Makefile b/cleopatre/application/lltd/Makefile
index feb97214fd..c7b994b3e6 100644
--- a/cleopatre/application/lltd/Makefile
+++ b/cleopatre/application/lltd/Makefile
@@ -3,6 +3,9 @@ OBJPATH=obj
SRCPATH=src
INCPATH=src
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -Wall -Wno-unused -g -O3
@@ -11,7 +14,7 @@ else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include -MMD -pipe
+EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include -MMD -pipe @$(CLEO_BASE)/$(RESPONSE_FILE)
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
diff --git a/cleopatre/application/managerd/Makefile b/cleopatre/application/managerd/Makefile
index 8762c38e62..e45dbf8a49 100644
--- a/cleopatre/application/managerd/Makefile
+++ b/cleopatre/application/managerd/Makefile
@@ -4,19 +4,22 @@ SRCPATH=src
INCPATH=inc
OBJINCPATH=$(OBJPATH)/inc
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+CLEO_INC=$(CLEO_BASE)/include
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LINUX_DIR=../../linux-2.6.25.10-spc300
-LIBSPID_DIR=../libspid
-LIBMME_DIR=../libmme
+LINUX_DIR=$(CLEO_BASE)/linux-2.6.25.10-spc300
+LIBSPID_DIR=$(CLEO_BASE)/application/libspid
+LIBMME_DIR=$(CLEO_BASE)/application/libmme
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-CLEO_INC=../../include
-EXTRA_CFLAGS=-I$(INCPATH) -I$(OBJINCPATH) -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(CLEO_INC) -MMD
+EXTRA_CFLAGS=-I$(INCPATH) -I$(OBJINCPATH) -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(CLEO_INC) -MMD @$(CLEO_BASE)/$(RESPONSE_FILE)
LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid -lpthread
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
@@ -31,7 +34,7 @@ $(BIN): libspid libmme $(OBJS)
$(OBJPATH)/%.o: $(SRCPATH)/%.c
$(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
-$(OBJS): $(OBJINCPATH)/managerd_config.h | $(OBJPATH)
+$(OBJS): $(OBJPATH)
$(OBJPATH):
mkdir $(OBJPATH)
@@ -39,9 +42,6 @@ $(OBJPATH):
$(OBJINCPATH): | $(OBJPATH)
mkdir $@
-$(OBJINCPATH)/managerd_config.h: .config | $(OBJINCPATH)
- ./config_to_header $< $@ MANAGERD_CONFIG_H
-
libspid:
$(MAKE) -C $(LIBSPID_DIR) libspid.so
diff --git a/cleopatre/application/managerd/config_to_header b/cleopatre/application/managerd/config_to_header
deleted file mode 120000
index e29efd024d..0000000000
--- a/cleopatre/application/managerd/config_to_header
+++ /dev/null
@@ -1 +0,0 @@
-../config_to_header \ No newline at end of file
diff --git a/cleopatre/application/managerd/src/gpio_event.c b/cleopatre/application/managerd/src/gpio_event.c
index 11a9178149..e157c2eab1 100644
--- a/cleopatre/application/managerd/src/gpio_event.c
+++ b/cleopatre/application/managerd/src/gpio_event.c
@@ -33,7 +33,6 @@
#include "../../linux/gpio.h"
#include "managerd.h"
-#include "managerd_config.h"
#include "gpio_event.h"
/* Global variable for "/dev/gpio" file descriptor
diff --git a/cleopatre/application/spidapp/Makefile b/cleopatre/application/spidapp/Makefile
index c6da2abb49..4b1e238918 100644
--- a/cleopatre/application/spidapp/Makefile
+++ b/cleopatre/application/spidapp/Makefile
@@ -3,19 +3,22 @@ OBJPATH=obj
SRCPATH=src
INCPATH=inc
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LINUX_DIR=../../linux-2.6.25.10-spc300
-LIBSPID_DIR=../libspid
-LIBMME_DIR=../libmme
+LINUX_DIR=$(CLEO_BASE)/linux-2.6.25.10-spc300
+LIBSPID_DIR=$(CLEO_BASE)/application/libspid
+LIBMME_DIR=$(CLEO_BASE)/application/libmme
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-CLEO_INC=../../include
-EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(CLEO_INC) -MMD
+CLEO_INC=$(CLEO_BASE)/include
+EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(CLEO_INC) -MMD @$(CLEO_BASE)/$(RESPONSE_FILE)
LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
diff --git a/cleopatre/application/spidinit/Makefile b/cleopatre/application/spidinit/Makefile
index b9795f889e..68a711c2d6 100644
--- a/cleopatre/application/spidinit/Makefile
+++ b/cleopatre/application/spidinit/Makefile
@@ -2,20 +2,21 @@ BIN=spidinit
OBJPATH=obj
SRCPATH=src
INCPATH=inc
-BASE=../..
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LIBSPID_DIR=../libspid
-LIBMME_DIR=../libmme
+LIBSPID_DIR=$(CLEO_BASE)/libspid
+LIBMME_DIR=$(CLEO_BASE)/libmme
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
- -I$(BASE)/include -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -MMD
+ -I$(CLEO_BASE)/include -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -MMD -@$(CLEO_BASE)/$(RESPONSE_FILE)
LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
diff --git a/cleopatre/application/upnpd/Makefile b/cleopatre/application/upnpd/Makefile
index e7286671e0..299b79a2b3 100644
--- a/cleopatre/application/upnpd/Makefile
+++ b/cleopatre/application/upnpd/Makefile
@@ -3,16 +3,19 @@ OBJPATH=obj
SRCPATH=src
INCPATH=inc
+CLEO_BASE=../..
+RESPONSE_FILE=extra_flags
+
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
-LINUX_DIR=../../linux-2.6.25.10-spc300
+LINUX_DIR=$(CLEO_BASE)/linux-2.6.25.10-spc300
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -MMD
+EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -MMD @$(CLEO_BASE)/$(RESPONSE_FILE)
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))