From f229dc7f1784e20856c0f38292af4a88cb19dcba Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 30 Dec 2019 12:59:48 +1100
Subject: Backport: Remove Scintilla.def prerequisite as not used by gcc or
 clang. That allows simplifying the recipe to just use the prerequisites $^.

Backport of changeset 7857:09ace49cbc12.
---
 win32/makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'win32/makefile')

diff --git a/win32/makefile b/win32/makefile
index 7a24fee91..b49d470d2 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -162,11 +162,11 @@ LEXCOMPONENT_OBJS = \
 	ScintillaDLL.o \
 	ScintRes.o
 
-$(COMPONENT): $(COMPONENT_OBJS) Scintilla.def
-	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(COMPONENT_OBJS) $(CXXFLAGS) $(LIBS)
+$(COMPONENT): $(COMPONENT_OBJS)
+	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
-$(LEXCOMPONENT): $(LEXCOMPONENT_OBJS) Scintilla.def
-	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LEXCOMPONENT_OBJS) $(CXXFLAGS) $(LIBS)
+$(LEXCOMPONENT): $(LEXCOMPONENT_OBJS)
+	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
 $(LIBSCI): $(SCILEX_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
-- 
cgit v1.2.3