summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/Makefile4
-rw-r--r--cleopatre/application/libmme/Makefile10
-rw-r--r--cleopatre/devkit/plcdrv/Makefile13
-rw-r--r--common/lib/mmtcgen/Makefile14
4 files changed, 19 insertions, 22 deletions
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index 137ee077c0..8158c5f223 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -47,6 +47,9 @@ CLEOPATRE_PATH=$(WORK_DIRECTORY)/cleopatre
CESAR_PATH=$(WORK_DIRECTORY)/cesar
COMMON_PATH=$(WORK_DIRECTORY)/common
+MMTCGEN=$(COMMON_PATH)/lib/mmtcgen
+LIBMME_PATH=$(CLEOPATRE_PATH)/application/libmme
+
PLCDRV_NAME=plcdrv.ko
PLCDRV_PATH=$(CLEOPATRE_PATH)/devkit/plcdrv
@@ -118,6 +121,7 @@ bundle-standalone:
$(Q)echo "Generate bundle sources..."
$(Q)mkdir -p $(WORK_DIRECTORY)
$(Q)(cd $(GIT_BASE) && git archive --format=tar HEAD: $(GIT_DIRECTORIES)) | tar -x -C $(WORK_DIRECTORY)
+ $(Q)$(MAKE) -C $(LIBMME_PATH) bundle
$(Q)cp -R $(CLEOPATRE_PATH) $(BUNDLE_PATH)
$(Q)cp -R $(COMMON_PATH)/tools/genNVRAM $(BUNDLE_PATH)/tools
$(Q)echo "Generate PLC binaries..."
diff --git a/cleopatre/application/libmme/Makefile b/cleopatre/application/libmme/Makefile
index 53623382a5..1fb8aa613d 100644
--- a/cleopatre/application/libmme/Makefile
+++ b/cleopatre/application/libmme/Makefile
@@ -23,7 +23,7 @@ DYN_OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.dyn.o))
STAT_OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.stat.o))
DYN_DEPS=$(patsubst %o,%d,$(DYN_OBJS))
STAT_DEPS=$(patsubst %o,%d,$(STAT_OBJS))
-MMETYPES=$(INCPATH)/mmtypes.h
+MMTYPES=$(INCPATH)/mmtypes.h
MMTCGEN=$(BASE)/../common/lib/mmtcgen
all: $(STAT_LIB) $(DYN_LIB)
@@ -34,10 +34,10 @@ $(STAT_LIB): $(STAT_OBJS)
$(DYN_LIB): $(DYN_OBJS)
$(CC_WITHOUT_CFLAGS) -shared -fPIC -o $@ $(DYN_OBJS)
-$(OBJPATH)/%.stat.o: $(SRCPATH)/%.c $(MMETYPES)
+$(OBJPATH)/%.stat.o: $(SRCPATH)/%.c $(MMTYPES)
$(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
-$(OBJPATH)/%.dyn.o: $(SRCPATH)/%.c $(MMETYPES)
+$(OBJPATH)/%.dyn.o: $(SRCPATH)/%.c $(MMTYPES)
$(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -fPIC -o $@ -c $<
$(DYN_OBJS) $(STAT_OBJS): | $(OBJPATH)
@@ -51,7 +51,7 @@ $(MMETYPES): $(MMTCGEN)/parser.py
$(OBJPATH):
mkdir $(OBJPATH)
--include $(STAT_DEPS) $(DYN_DEPS)
+-include $(STAT_DEPS) $(DYN_DEPS) $(MMTCGEN)/Makefile
.PHONY: all clean
@@ -59,6 +59,6 @@ clean:
rm -f $(DYN_OBJS) $(STAT_OBJS) $(STAT_DEPS) $(DYN_DEPS) $(DYN_LIB) \
$(STAT_LIB)
if [ -e $(MMTCGEN) ]; then \
- rm -f $(MMETYPES); \
+ rm -f $(MMTYPES); \
fi;
rmdir $(OBJPATH)
diff --git a/cleopatre/devkit/plcdrv/Makefile b/cleopatre/devkit/plcdrv/Makefile
index 1fae9addd8..86f357fe0c 100644
--- a/cleopatre/devkit/plcdrv/Makefile
+++ b/cleopatre/devkit/plcdrv/Makefile
@@ -14,15 +14,8 @@ all: $(MMTYPES)
%::
$(MAKE) -C $(KERNELDIR) M=`pwd` ARCH=arm CROSS_COMPILE=arm-linux- $@ BUNDLE_VERSION=$(BUNDLE_VERSION)
-$(MMTCGEN)/parser.py: $(MMTCGEN)/parser.g
- yapps $<
-
-$(MMTYPES): $(MMTCGEN)/parser.py
- python $(MMTCGEN)/mmtcgen.py $@
-
clean::
$(MAKE) -C $(KERNELDIR) M=`pwd` ARCH=arm CROSS_COMPILE=arm-linux- $@
- rm -f $(CURDIR)/modules.order
- if [ -e $(MMTCGEN) ]; then \
- rm $(MMTYPES); \
- fi;
+ rm -f $(CURDIR)/modules.order $(MMTYPES)
+
+-include $(MMTCGEN)/Makefile
diff --git a/common/lib/mmtcgen/Makefile b/common/lib/mmtcgen/Makefile
index 9ff6ca3d92..f076a0b563 100644
--- a/common/lib/mmtcgen/Makefile
+++ b/common/lib/mmtcgen/Makefile
@@ -1,14 +1,14 @@
YAPPS=yapps
PARSER=parser.g
-all: py
+$(MMTCGEN)/$(PARSER):
+ :
-clean:
- rm -f $(PARSER:%.g=%.py)
-
-py: $(PARSER:%.g=%.py)
-
-%.py: %.g
+$(MMTCGEN)/parser.py: $(MMTCGEN)/$(PARSER)
$(YAPPS) $<
+$(MMTYPES): $(MMTCGEN)/parser.py
+ python $(MMTCGEN)/mmtcgen.py $@
+bundle: $(MMTYPES)
+ :