- fixed dependency issue compiling always all files
git-svn-id: http://moon:8086/svn/software/trunk/make@1100 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+5
-5
@@ -1,23 +1,23 @@
|
|||||||
DEPFLAGS := -MMD
|
DEPFLAGS = -MMD
|
||||||
|
|
||||||
CFLAGS += ${CFLAGS_${CONFIG}}
|
CFLAGS += ${CFLAGS_${CONFIG}}
|
||||||
CXXFLAGS += ${CXXFLAGS_${CONFIG}}
|
CXXFLAGS += ${CXXFLAGS_${CONFIG}}
|
||||||
DEFINES += ${DEFINES_${CONFIG}}
|
DEFINES += ${DEFINES_${CONFIG}}
|
||||||
|
|
||||||
CXX_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(CXX_SRCS)))
|
CXX_OBJS = $(addprefix ${BUILD_DIR}/, $(CXX_SRCS:.cpp=.o))
|
||||||
GCC_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .c,.o,$(GCC_SRCS)))
|
GCC_OBJS = $(addprefix ${BUILD_DIR}/, $(GCC_SRCS:.c=.o))
|
||||||
|
|
||||||
OBJS = $(shell find ${BUILD_DIR} -name *.o 2>/dev/null)
|
OBJS = $(shell find ${BUILD_DIR} -name *.o 2>/dev/null)
|
||||||
DEPS := $(OBJS:%.o=%.d)
|
DEPS := $(OBJS:%.o=%.d)
|
||||||
|
|
||||||
compile: pkg_info ${CXX_OBJS} ${GCC_OBJS}
|
compile: pkg_info ${CXX_OBJS} ${GCC_OBJS}
|
||||||
|
|
||||||
${CXX_OBJS}: $(BUILD_DIR)/%.o : %.cpp $(CXX_SRCS) | $(BUILD_DIR)
|
$(BUILD_DIR)/%.o : %.cpp | $(BUILD_DIR)
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
@echo Compiling $<
|
@echo Compiling $<
|
||||||
$(CXX) ${DEPFLAGS} ${CXXFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
|
$(CXX) ${DEPFLAGS} ${CXXFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
|
||||||
|
|
||||||
${GCC_OBJS}: $(BUILD_DIR)/%.o : %.c $(GCC_SRCS) | $(BUILD_DIR)
|
$(BUILD_DIR)/%.o : %.c | $(BUILD_DIR)
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
@echo Compiling $<
|
@echo Compiling $<
|
||||||
$(CC) ${DEPFLAGS} ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
|
$(CC) ${DEPFLAGS} ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
|
||||||
|
|||||||
Reference in New Issue
Block a user