Module: wine Branch: master Commit: 070147a0341769234a52f83f298ab5a39a60a66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=070147a0341769234a52f83f29...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 12 20:08:02 2013 +0100
makefiles: Get rid of the VPATH directive.
---
Make.vars.in | 1 - configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Make.vars.in b/Make.vars.in index a002c92..ac74f1f 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -15,7 +15,6 @@ fakedlldir = $(dlldir)/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ -VPATH = @srcdir@ SHELL = /bin/sh RM = rm -f MV = mv diff --git a/configure b/configure index c080f84..1f541e1 100755 --- a/configure +++ b/configure @@ -7268,10 +7268,10 @@ fi LIBWINE_RULES=" all: libwine.dll libwine.a
-libwine.a: wine.def +libwine.a: $(srcdir)/wine.def $(DLLTOOL) -l $@ -d $(srcdir)/wine.def
-libwine.dll: $(OBJS) wine.def +libwine.dll: $(OBJS) $(srcdir)/wine.def $(CC) -shared $(srcdir)/wine.def -o $@ $(OBJS) $crtlibs $(EXTRALIBS)
install install-lib:: libwine.dll $(DESTDIR)$(libdir) dummy @@ -7994,7 +7994,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LIBWINE_RULES=" all: libwine.so
-libwine.so.$(VERSION): $(OBJS) wine.map +libwine.so.$(VERSION): $(OBJS) $(srcdir)/wine.map $LDSHARED $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
libwine.so.$(SOVERSION): libwine.so.$(VERSION) @@ -17539,7 +17539,7 @@ if test "x$enable_tools" != xno then ac_config_commands="$ac_config_commands tools"
- wine_fn_append_rule "tools/makedep$ac_exeext: tools/makedep.c include/config.h + wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h $(CC) -Iinclude -I$srcdir/include $(ALLCFLAGS) -o $@ $srcdir/tools/makedep.c $(LDFLAGS) clean:: __clean__ $(RM) tools/makedep$ac_exeext" diff --git a/configure.ac b/configure.ac index 38594e4..b6b9653 100644 --- a/configure.ac +++ b/configure.ac @@ -722,10 +722,10 @@ case $host_os in AC_SUBST(LIBWINE_RULES,[" all: libwine.dll libwine.a
-libwine.a: wine.def +libwine.a: $(srcdir)/wine.def $(DLLTOOL) -l $@ -d $(srcdir)/wine.def
-libwine.dll: $(OBJS) wine.def +libwine.dll: $(OBJS) $(srcdir)/wine.def $(CC) -shared $(srcdir)/wine.def -o $@ $(OBJS) $crtlibs $(EXTRALIBS)
install install-lib:: libwine.dll $(DESTDIR)$(libdir) dummy @@ -990,7 +990,7 @@ wine-installed: main.o AC_SUBST(LIBWINE_RULES,[" all: libwine.so
-libwine.so.$(VERSION): $(OBJS) wine.map +libwine.so.$(VERSION): $(OBJS) $(srcdir)/wine.map $LDSHARED $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
libwine.so.$(SOVERSION): libwine.so.$(VERSION) @@ -3509,7 +3509,7 @@ if test "x$enable_tools" != xno then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( -[tools/makedep$ac_exeext: tools/makedep.c include/config.h +[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h $(CC) -Iinclude -I$srcdir/include $(ALLCFLAGS) -o $@ $srcdir/tools/makedep.c $(LDFLAGS) clean:: __clean__ $(RM) tools/makedep$ac_exeext])