summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/buildroot/package/plcd/plcd.mk14
-rw-r--r--cleopatre/devkit/plcd/Makefile32
2 files changed, 25 insertions, 21 deletions
diff --git a/cleopatre/buildroot/package/plcd/plcd.mk b/cleopatre/buildroot/package/plcd/plcd.mk
index 3ed3838954..2772e14780 100644
--- a/cleopatre/buildroot/package/plcd/plcd.mk
+++ b/cleopatre/buildroot/package/plcd/plcd.mk
@@ -33,7 +33,7 @@ PLCD_LIBSPID_SITE:=$(BASE_DIR)/../application/libspid
ifneq ($(IS_PLCD_DEV),)
PLCD_SITE:=$(PLCD_DEV_SITE)
- PLCD_DEV_MAKE:=plcd-dev-make
+ PLCD_DEV_MAKE:=$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(PLCD_DIR) plcd
PLCD_DEV_CLEAN:=plcd-dev-clean
PLCD_BIN:=plcd
else
@@ -43,11 +43,6 @@ else
PLCD_BIN:=plcd-$(subst ",,$(BR2_TARGET_SPIDCOM_CHIP))
endif
-plcd-dev-make: $(PLCD_LIBSPID_SITE)/libspid.so
- $(TARGET_CONFIGURE_OPTS) \
- $(MAKE) -C $(PLCD_DIR) plcd \
- LINUX_DIR="$(BASE_DIR)/../linux-2.6.25.10-spc300"
-
plcd-dev-clean:
-$(MAKE) -C $(PLCD_DIR) clean
@@ -60,7 +55,10 @@ $(PLCD_DIR)/.unpacked:
$(PLCD_DIR)/.configured: $(PLCD_DIR)/.unpacked
touch $(PLCD_DIR)/.configured
-$(PLCD_DIR)/$(PLCD_BIN): $(PLCD_DIR)/.configured $(PLCD_DEV_MAKE)
+$(PLCD_DIR)/$(PLCD_BIN): $(PLCD_LIBSPID_SITE)/libspid.so \
+ $(PLCD_DIR)/.configured \
+ FORCE_PLCD_MAKE
+ $(PLCD_DEV_MAKE)
$(TARGET_DIR)/usr/sbin/plcd: $(PLCD_DIR)/$(PLCD_BIN)
cp $< $@
@@ -73,7 +71,7 @@ plcd-clean: $(PLCD_DEV_CLEAN)
plcd-dirclean:
rm -f $(PLCD_DIR)
-.PHONY: $(TARGET_DIR)/usr/sbin/plcd
+.PHONY: FORCE_PLCD_MAKE
#############################################################
#
diff --git a/cleopatre/devkit/plcd/Makefile b/cleopatre/devkit/plcd/Makefile
index f4f1c1f61c..e3f8dd3cb1 100644
--- a/cleopatre/devkit/plcd/Makefile
+++ b/cleopatre/devkit/plcd/Makefile
@@ -7,19 +7,27 @@ CLEO_BASE=../..
LIBMME_DIR=$(CLEO_BASE)/application/libmme
LIBSPID_DIR=$(CLEO_BASE)/application/libspid
LINUX_DIR=$(CLEO_BASE)/linux-2.6.25.10-spc300
-RESPONSE_FILE=extra_flags
+
+LIBSPID_SO_BIN = $(LIBSPID_DIR)/libspid.so
+LIBMME_SO_BIN = $(LIBMME_DIR)/libmme.so
ifeq ($(VERSION), )
VERSION=$(shell git describe --always 2>/dev/null)
endif
-INC=-I$(INCPATH) -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I../../include \
- -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
- $(shell $(LIBSPID_DIR)/libspid-config --I_opts)
+RESPONSE_FILE=extra_flags
+INCLUDES = -I$(INCPATH) \
+ -I$(CLEO_BASE)/include \
+ -I$(LINUX_DIR)/include \
+ -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
+ $(shell $(LIBSPID_DIR)/libspid-config --I_opts)
CC=arm-linux-gcc
-CFLAGS+= $(INC) -Os -MMD -DVERSION=\"$(VERSION)\" @$(CLEO_BASE)/$(RESPONSE_FILE)
-LIBFLAGS=$(shell $(LIBSPID_DIR)/libspid-config --L_opts) $(shell $(LIBSPID_DIR)/libspid-config --libs) -lrt
+CFLAGS += $(INCLUDES) -Os -MMD -Wall -DVERSION=\"$(VERSION)\" \
+ @$(CLEO_BASE)/$(RESPONSE_FILE)
+
+LIBFLAGS = $(shell $(LIBSPID_DIR)/libspid-config --L_opts) \
+ $(shell $(LIBSPID_DIR)/libspid-config --libs) -lrt
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
@@ -27,7 +35,7 @@ DEPS=$(patsubst %o,%d,$(OBJS))
all: $(BIN)
-$(BIN): libmme libspid $(OBJS)
+$(BIN): $(OBJS) $(LIBSPID_SO_BIN) $(LIBMME_SO_BIN)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBFLAGS)
$(OBJPATH)/%.o: $(SRCPATH)/%.c
@@ -38,15 +46,13 @@ $(OBJS): | $(OBJPATH)
$(OBJPATH):
mkdir $(OBJPATH)
-libmme:
- $(MAKE) -C $(LIBMME_DIR)
-
-libspid:
- $(MAKE) -C $(LIBSPID_DIR)
+$(LIBSPID_SO_BIN) $(LIBMME_SO_BIN):
+ $(error libspid or libmme output files are not found)
-include $(DEPS)
-.PHONY: all clean libmme libspid
+.PHONY: all clean
clean:
rm -f $(OBJS) $(DEPS) $(BIN)
+ rmdir $(OBJPATH)