From be3e40aa40ba12262aba550b2bab6a69e8b4db2e Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Thu, 22 Jul 2021 01:31:50 +0000 Subject: [PATCH] Fixed makefile such that final linking isnt redone. Still need to ensure build dir is created for parent objects --- Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 28b96ea..b354769 100644 --- a/Makefile +++ b/Makefile @@ -10,21 +10,21 @@ OBJS-top=$(patsubst %,$(BUILD_DIR)/%,$(_OBJS-top)) -.PHONY: parser gen clean default all +.PHONY: clean default all default: docconv $(BUILD_DIR) all: default -docconv: parser gen $(OBJS-top) - $(CXX) $(CXXFLAGS) -o $@ $(BUILD_DIR)/*.o +docconv: $(BUILD_DIR)/parsers $(BUILD_DIR)/gens $(OBJS-top) + $(CXX) $(CXXFLAGS) -o $@ $(BUILD_DIR)/*.o $(BUILD_DIR)/parsers/*.o $(BUILD_DIR)/gens/*.o $(BUILD_DIR)/%.o: %.cpp - $(CXX) -c $(CXXFLAGS) -o $@ $^ + $(CXX) -c $(CXXFLAGS) -o $@ $< -parser: $(BUILD_DIR) +$(BUILD_DIR)/parsers: $(BUILD_DIR) $(MAKE) -C parsers -gen: $(BUILD_DIR) +$(BUILD_DIR)/gens: $(BUILD_DIR) $(MAKE) -C gens $(BUILD_DIR): -- Gitblit v1.10.0