Compare commits

..

No commits in common. "main" and "main" have entirely different histories.
main ... main

2 changed files with 6 additions and 11 deletions

View File

@ -34,7 +34,7 @@ ${TARGET}: sanity-checks $(BUILD_DIR) $(OBJ)
$(info ===> LINKING $(TARGET)) $(info ===> LINKING $(TARGET))
$(Q)${LINKER} ${LFLAGS} -o $(TARGET) $(OBJ) $(LIBS) $(Q)${LINKER} ${LFLAGS} -o $(TARGET) $(OBJ) $(LIBS)
$(BUILD_DIR)/%.o: %.c $(MAKE_DIR)/include_$(TAG).mk $(MAKE_DIR)/config.mk vis_dir $(BUILD_DIR)/%.o: %.c $(MAKE_DIR)/include_$(TAG).mk $(MAKE_DIR)/config.mk
$(info ===> COMPILE $@) $(info ===> COMPILE $@)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
$(Q)$(GCC) $(CPPFLAGS) -MT $(@:.d=.o) -MM $< > $(BUILD_DIR)/$*.d $(Q)$(GCC) $(CPPFLAGS) -MT $(@:.d=.o) -MM $< > $(BUILD_DIR)/$*.d
@ -43,7 +43,7 @@ $(BUILD_DIR)/%.s: %.c
$(info ===> GENERATE ASM $@) $(info ===> GENERATE ASM $@)
$(CC) -S $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -S $(CPPFLAGS) $(CFLAGS) $< -o $@
.PHONY: clean distclean vis vis_clean tags info asm format vis_dir .PHONY: clean distclean vis vis_clean tags info asm format
vis: vis:
$(info ===> GENERATE VISUALIZATION) $(info ===> GENERATE VISUALIZATION)
@ -89,10 +89,8 @@ ifeq ($(ENABLE_MPI),false)
endif endif
endif endif
$(BUILD_DIR): $(BUILD_DIR):
@mkdir $(BUILD_DIR) @mkdir $(BUILD_DIR)
vis_dir:
@mkdir -p vtk_files
-include $(OBJ:.o=.d) -include $(OBJ:.o=.d)

View File

@ -29,7 +29,7 @@ ${TARGET}: $(BUILD_DIR) $(OBJ)
$(info ===> LINKING $(TARGET)) $(info ===> LINKING $(TARGET))
$(Q)${LINKER} ${LFLAGS} -o $(TARGET) $(OBJ) $(LIBS) $(Q)${LINKER} ${LFLAGS} -o $(TARGET) $(OBJ) $(LIBS)
$(BUILD_DIR)/%.o: %.c $(MAKE_DIR)/include_$(TAG).mk $(MAKE_DIR)/config.mk vis_dir $(BUILD_DIR)/%.o: %.c $(MAKE_DIR)/include_$(TAG).mk $(MAKE_DIR)/config.mk
$(info ===> COMPILE $@) $(info ===> COMPILE $@)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
$(Q)$(GCC) $(CPPFLAGS) -MT $(@:.d=.o) -MM $< > $(BUILD_DIR)/$*.d $(Q)$(GCC) $(CPPFLAGS) -MT $(@:.d=.o) -MM $< > $(BUILD_DIR)/$*.d
@ -38,7 +38,7 @@ $(BUILD_DIR)/%.s: %.c
$(info ===> GENERATE ASM $@) $(info ===> GENERATE ASM $@)
$(CC) -S $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -S $(CPPFLAGS) $(CFLAGS) $< -o $@
.PHONY: clean distclean tags info asm format vis_dir .PHONY: clean distclean tags info asm format
vis: vis:
$(info ===> GENERATE VISUALIZATION) $(info ===> GENERATE VISUALIZATION)
@ -85,7 +85,4 @@ format:
$(BUILD_DIR): $(BUILD_DIR):
@mkdir $(BUILD_DIR) @mkdir $(BUILD_DIR)
vis_dir:
@mkdir -p vtk_files
-include $(OBJ:.o=.d) -include $(OBJ:.o=.d)