aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-12-30 12:59:48 +1100
committerNeil <nyamatongwe@gmail.com>2019-12-30 12:59:48 +1100
commitf229dc7f1784e20856c0f38292af4a88cb19dcba (patch)
treecf589086dda8095842d51c1931ef7b8d95aa2fd5
parent0f01055777bb39e4744fa3465b0ab14691c7f6df (diff)
downloadscintilla-mirror-f229dc7f1784e20856c0f38292af4a88cb19dcba.tar.gz
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.
-rw-r--r--win32/makefile8
1 files changed, 4 insertions, 4 deletions
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) $@ $^