Skip to content

W
wine-winehq
Commit 070147a0 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makefiles: Get rid of the VPATH directive.

parent c2efb3b3
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
Make.vars.in
View file @ 070147a0
...@@ -15,7 +15,6 @@ fakedlldir = $(dlldir)/fakedlls ...@@ -15,7 +15,6 @@ fakedlldir = $(dlldir)/fakedlls
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@
SHELL = /bin/sh SHELL = /bin/sh
RM = rm -f RM = rm -f
MV = mv MV = mv
......
configure
View file @ 070147a0
...@@ -7268,10 +7268,10 @@ fi ...@@ -7268,10 +7268,10 @@ fi
LIBWINE_RULES=" LIBWINE_RULES="
all: libwine.dll libwine.a all: libwine.dll libwine.a
libwine.a: wine.def libwine.a: \$(srcdir)/wine.def
\$(DLLTOOL) -l \$@ -d \$(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) \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy
...@@ -7994,7 +7994,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } ...@@ -7994,7 +7994,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; }
LIBWINE_RULES=" LIBWINE_RULES="
all: libwine.so all: libwine.so
libwine.so.\$(VERSION): \$(OBJS) wine.map libwine.so.\$(VERSION): \$(OBJS) \$(srcdir)/wine.map
$LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) libwine.so.\$(SOVERSION): libwine.so.\$(VERSION)
...@@ -17539,7 +17539,7 @@ if test "x$enable_tools" != xno ...@@ -17539,7 +17539,7 @@ if test "x$enable_tools" != xno
then then
ac_config_commands="$ac_config_commands tools" 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) \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS)
clean:: __clean__ clean:: __clean__
\$(RM) tools/makedep$ac_exeext" \$(RM) tools/makedep$ac_exeext"
......
configure.ac
View file @ 070147a0
...@@ -722,10 +722,10 @@ case $host_os in ...@@ -722,10 +722,10 @@ case $host_os in
AC_SUBST(LIBWINE_RULES,[" AC_SUBST(LIBWINE_RULES,["
all: libwine.dll libwine.a all: libwine.dll libwine.a
libwine.a: wine.def libwine.a: \$(srcdir)/wine.def
\$(DLLTOOL) -l \$@ -d \$(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) \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy
...@@ -990,7 +990,7 @@ wine-installed: main.o ...@@ -990,7 +990,7 @@ wine-installed: main.o
AC_SUBST(LIBWINE_RULES,[" AC_SUBST(LIBWINE_RULES,["
all: libwine.so all: libwine.so
libwine.so.\$(VERSION): \$(OBJS) wine.map libwine.so.\$(VERSION): \$(OBJS) \$(srcdir)/wine.map
$LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) libwine.so.\$(SOVERSION): libwine.so.\$(VERSION)
...@@ -3509,7 +3509,7 @@ if test "x$enable_tools" != xno ...@@ -3509,7 +3509,7 @@ if test "x$enable_tools" != xno
then then
AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)])
WINE_APPEND_RULE( 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) \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS)
clean:: __clean__ clean:: __clean__
\$(RM) tools/makedep$ac_exeext]) \$(RM) tools/makedep$ac_exeext])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment