summaryrefslogtreecommitdiff
path: root/cleopatre/application/libspid
diff options
context:
space:
mode:
authorThierry Carré2013-03-01 15:54:20 +0100
committerThierry Carré2013-03-08 14:22:50 +0100
commit9caa7411aa731b11e7466585d315c4aef7674cae (patch)
tree2666a35215b10d8080728f584b273e1c2910d70d /cleopatre/application/libspid
parentbbf489488862380c52387e72fe119735861120b1 (diff)
cleo/app/{libmme, libspid}: rewrite 'includes' and 'cflags'
"-Wall" added in EXTRA_CFLAGS
Diffstat (limited to 'cleopatre/application/libspid')
-rw-r--r--cleopatre/application/libspid/Makefile20
1 files changed, 14 insertions, 6 deletions
diff --git a/cleopatre/application/libspid/Makefile b/cleopatre/application/libspid/Makefile
index 53946b13d2..ef85d1deaa 100644
--- a/cleopatre/application/libspid/Makefile
+++ b/cleopatre/application/libspid/Makefile
@@ -17,14 +17,22 @@ LIBMME_MMTYPE_H = $(LIBMME_DIR)/inc/mmtypes.h
ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
AR=arm-linux-ar
-CC_WITH_CFLAGS=$(CC) -g -Os @$(CLEO_DIR)/$(RESPONSE_FILE)
+CC_WITH_CFLAGS= $(CC) -g -Os
CC_WITHOUT_CFLAGS=$(CC)
else #compile from buildroot
-CC_WITH_CFLAGS=$(CC) @$(CLEO_DIR)/$(RESPONSE_FILE)
+CC_WITH_CFLAGS = $(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-INCLUDES=-I$(INCPATH) -I$(CLEO_DIR)/include -I$(LINUX_DIR)/include -MMD -I$(LINUX_DIR)/include/asm-arm/arch-spc300
-INCLUDES+=$(shell $(LIBMME_DIR)/libmme-config --I_opts)
+
+INCLUDES = -I$(INCPATH) \
+ -I$(CLEO_DIR)/include \
+ -I$(LINUX_DIR)/include \
+ -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
+ $(shell $(LIBMME_DIR)/libmme-config --I_opts)
+
+EXTRA_CFLAGS = $(INCLUDES) -MMD -Wall \
+ @$(CLEO_DIR)/$(RESPONSE_FILE)
+
LDOPTS=$(shell $(LIBMME_DIR)/libmme-config --ldopts)
LIBS=$(shell $(LIBMME_DIR)/libmme-config --libs)
L_OPTS=$(shell $(LIBMME_DIR)/libmme-config --L_opts)
@@ -45,10 +53,10 @@ $(DYN_LIB): $(DYN_OBJS) $(LIBMME_SO_BIN)
$(CC_WITHOUT_CFLAGS) -shared -fPIC $(LDOPTS) $(L_OPTS) $(LIBS) -o $@ $(DYN_OBJS)
$(OBJPATH)/%.stat.o: $(SRCPATH)/%.c $(LIBMME_MMTYPE_H)
- $(CC_WITH_CFLAGS) $(INCLUDES) -o $@ -c $<
+ $(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
$(OBJPATH)/%.dyn.o: $(SRCPATH)/%.c $(LIBMME_MMTYPE_H)
- $(CC_WITH_CFLAGS) $(INCLUDES) -fPIC -o $@ -c $<
+ $(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -fPIC -o $@ -c $<
$(DYN_OBJS) $(STAT_OBJS): | $(OBJPATH)