From 8beb15aa955a592595f5afa4a234ac820b82f296 Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Fri, 18 Dec 1998 17:30:52 +0000 Subject: [PATCH] Use -lwine for linking. --- Make.rules.in | 2 +- Makefile.in | 2 +- configure | 2 +- configure.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 32f5996e3e0..9e662aa088a 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -23,7 +23,7 @@ OPTIONS = @OPTIONS@ -D_REENTRANT X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ -WINELIB = $(WINESTUB) $(TOPOBJDIR)/@LIB_TARGET@ +WINELIB = $(WINESTUB) -L$(TOPOBJDIR) -lwine LIBS = @LIBS@ YACC = @YACC@ LEX = @LEX@ diff --git a/Makefile.in b/Makefile.in index 2173af0bfba..fdda26a96f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -153,7 +153,7 @@ emu: wine lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) wine wine.sym: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy - $(CC) -o wine $(EMUOBJS) $(LIB_TARGET) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) + $(CC) -o wine $(EMUOBJS) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) nm -n wine | grep -v _compiled >wine.sym @echo "Wine build complete." diff --git a/configure b/configure index f401e626b3d..76e9a499ccf 100755 --- a/configure +++ b/configure @@ -563,7 +563,7 @@ test -z "$PROGEXT" && PROGEXT="" MAIN_TARGET=emu LIB_TARGET=libwine.a -ALT_LINK=" " +ALT_LINK="-L\$(TOPOBJDIR) -lwine" TRACE_MSGS=yes # the TRACE() macro DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros. diff --git a/configure.in b/configure.in index 19106394f84..040057fd75a 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ dnl **** Command-line arguments **** dnl Default values MAIN_TARGET=emu LIB_TARGET=libwine.a -ALT_LINK=" " +ALT_LINK="-L\$(TOPOBJDIR) -lwine" TRACE_MSGS=yes # the TRACE() macro DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.