From a387aa48683d831dd7064b200e9d0938b09e368a Mon Sep 17 00:00:00 2001 From: Marcus Meissner <Marcus.Meissner@caldera.de> Date: Tue, 26 Sep 2000 23:09:47 +0000 Subject: [PATCH] Migrate $LDFLAGS from configure to Makefile and into main wine executable. --- Make.rules.in | 1 + Makefile.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Make.rules.in b/Make.rules.in index 454eb4112ba..7ebc1729892 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -40,6 +40,7 @@ LN_S = @LN_S@ DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) LDCOMBINE = ld -r +LDFLAGS = @LDFLAGS@ AR = ar rc RM = rm -f MV = mv diff --git a/Makefile.in b/Makefile.in index 4e5bd31b5a1..061722731d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -115,7 +115,7 @@ Make.rules: Make.rules.in configure @exit 1 wine: libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) dlls $(EMUOBJS) - $(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) + $(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) $(LDFLAGS) llib-lwine.ln : $(LIBLINTS) $(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS) -- GitLab