From 4dfd0f78c38443abe16d272ca41f714aaba95c00 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Wed, 21 Mar 2018 07:31:35 -0400 Subject: [PATCH] Revert "Fix order of OBJECTS prerequisites" This reverts commit 1d11d473f193768a0277041949d7a3c90090ff9c. --- compile.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compile.mk b/compile.mk index d3e38566..57533f01 100644 --- a/compile.mk +++ b/compile.mk @@ -43,14 +43,14 @@ CXXFLAGS += $(FLAGS) # Derive object files from sources and place them before user-defined objects -SOURCE_OBJECTS := $(patsubst %, build/%.o, $(SOURCES)) +OBJECTS := $(patsubst %, build/%.o, $(SOURCES)) $(OBJECTS) DEPS := $(patsubst %, build/%.d, $(SOURCES)) # Final targets -$(TARGET): $(RESOURCES) $(OBJECTS) $(SOURCE_OBJECTS) - $(CXX) -o $@ $(SOURCE_OBJECTS) $(OBJECTS) $(LDFLAGS) +$(TARGET): $(RESOURCES) $(OBJECTS) + $(CXX) -o $@ $(OBJECTS) $(LDFLAGS) -include $(DEPS)