makefiles: Rename the SRCDIR, TOPSRCDIR and TOPOBJDIR variables to follow autoconf conventions.
diff --git a/Make.rules.in b/Make.rules.in
index 6f254f7..5415e8c 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -13,7 +13,7 @@
# First some useful definitions
LDSHARED = @LDSHARED@
-INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
+INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL)
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
@@ -35,7 +35,7 @@
LINTS = $(C_SRCS:.c=.ln)
filter: dummy
- @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all
+ @$(top_srcdir)/tools/winapi/make_filter --make $(MAKE) all
.PHONY: all filter
@@ -89,7 +89,7 @@
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
.sfd.ttf:
- $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
+ $(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@
.man.in.man:
LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false)
@@ -133,7 +133,7 @@
$(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)
depend: dummy
- $(MAKEDEP) $(MAKEDEPFLAGS) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
+ $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(EXTRAINCL) $(DEPEND_SRCS)
.PHONY: depend
diff --git a/Make.vars.in b/Make.vars.in
index 9bc1b0d8..f04a088 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -13,9 +13,9 @@
includedir = @includedir@/wine
dlldir = @libdir@/wine
fakedlldir = $(dlldir)/fakedlls
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = @top_builddir@
-SRCDIR = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+srcdir = @srcdir@
VPATH = @srcdir@
SHELL = /bin/sh
RM = rm -f
@@ -55,11 +55,11 @@
CROSSTARGET = @CROSSTARGET@
CROSSAR = $(CROSSTARGET)-ar
CROSSRANLIB = $(CROSSTARGET)-ranlib
-MKINSTALLDIRS = $(TOPSRCDIR)/tools/mkinstalldirs -m 755
-WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
-BUILDIMAGE = $(TOPSRCDIR)/tools/buildimage
-C2MAN = $(TOPSRCDIR)/tools/c2man.pl
-RUNTEST = $(TOPSRCDIR)/tools/runtest
+MKINSTALLDIRS = $(top_srcdir)/tools/mkinstalldirs -m 755
+WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check
+BUILDIMAGE = $(top_srcdir)/tools/buildimage
+C2MAN = $(top_srcdir)/tools/c2man.pl
+RUNTEST = $(top_srcdir)/tools/runtest
MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT)
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT)
@@ -68,11 +68,11 @@
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT)
WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT)
WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
-LIBPORT = $(TOPOBJDIR)/libs/port/libwine_port.a
-LIBWPP = $(TOPOBJDIR)/libs/wpp/libwpp.a
-LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine
-WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) @UNWINDFLAGS@
-CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) --lib-suffix=.cross.a
+LIBPORT = $(top_builddir)/libs/port/libwine_port.a
+LIBWPP = $(top_builddir)/libs/wpp/libwpp.a
+LIBWINE = -L$(top_builddir)/libs/wine -lwine
+WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@
+CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a
LDPATH = @LDPATH@
LDRPATH_INSTALL = @LDRPATH_INSTALL@
LDRPATH_LOCAL = @LDRPATH_LOCAL@
diff --git a/Makefile.in b/Makefile.in
index 48fe82c..f8d760d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,12 +33,12 @@
# Rules for re-running configure
-$(SRCDIR)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4
- cd $(SRCDIR) && autoconf --warnings=all
+$(srcdir)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4
+ cd $(srcdir) && autoconf --warnings=all
-$(SRCDIR)/include/config.h.in: @MAINTAINER_MODE@ include/stamp-h.in
-$(SRCDIR)/include/stamp-h.in: configure.ac aclocal.m4
- cd $(SRCDIR) && autoheader --warnings=all
+$(srcdir)/include/config.h.in: @MAINTAINER_MODE@ include/stamp-h.in
+$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
+ cd $(srcdir) && autoheader --warnings=all
@echo timestamp > $@
config.status: configure
@@ -80,8 +80,8 @@
TAGS etags:
$(RM) TAGS
- (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs etags -a
+ (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a
tags ctags:
$(RM) tags
- (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs ctags -a
+ (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a
diff --git a/Maketest.rules.in b/Maketest.rules.in
index c7d0df0..31404d5 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -15,7 +15,7 @@
MODULE = $(TESTDLL:%.dll=%)_test.exe
TESTRESULTS = $(C_SRCS:.c=.ok)
TESTPROGRAM = $(MODULE)$(DLLEXT)
-RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(TOPOBJDIR) -p $(TESTPROGRAM)
+RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(top_builddir) -p $(TESTPROGRAM)
ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
EXTRA_OBJS = testlist.o
@@ -37,7 +37,7 @@
testlist.c: Makefile.in $(MAKECTESTS)
$(MAKECTESTS) -o $@ $(C_SRCS)
-testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h
+testlist.o: testlist.c $(top_srcdir)/include/wine/test.h
# Rules for testing
diff --git a/aclocal.m4 b/aclocal.m4
index bfd0c49..b48296f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -271,9 +271,9 @@
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
+ \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec
$ac_file.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
+ \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec
install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x
@@ -281,7 +281,7 @@
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
- \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
+ \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec"
fi
if test "$ac_dir" != "$ac_implib"
@@ -338,8 +338,8 @@
ac_name=$[2]
wine_fn_append_file ALL_TEST_BINARIES $ac_name.exe
wine_fn_append_rule ALL_WINETEST_DEPENDS \
-"$ac_name.exe: \$(TOPOBJDIR)/$ac_dir/$ac_name.exe$DLLEXT
- cp \$(TOPOBJDIR)/$ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@]
+"$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT
+ cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@]
$ac_name.rc:
echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false)
$ac_name.res: $ac_name.rc $ac_name.exe"
diff --git a/configure b/configure
index 649d7b0..b9927b1 100755
--- a/configure
+++ b/configure
@@ -4152,11 +4152,11 @@
fi
fi
if test -z "$wine_cv_toolsdir"; then
- wine_cv_toolsdir="\$(TOPOBJDIR)"
+ wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
case "$wine_cv_toolsdir" in
/*) ;;
- *) wine_cv_toolsdir="\$(TOPOBJDIR)/$wine_cv_toolsdir" ;;
+ *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac
else
as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5
@@ -4848,7 +4848,7 @@
case "$INSTALL" in
[\\/$]* | ?:[\\/]* ) ;;
- *) INSTALL="\\\$(TOPSRCDIR)/$INSTALL" ;;
+ *) INSTALL="\\\$(top_srcdir)/$INSTALL" ;;
esac
for ac_prog in lclint lint
@@ -6489,7 +6489,7 @@
LIBWINE_LDFLAGS="-multiply_defined suppress"
LDSHARED="\$(CC) -dynamiclib"
STRIP="$STRIP -x"
- LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
+ LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
SECURITYLIB="-framework Security -framework CoreFoundation"
COREFOUNDATIONLIB="-framework CoreFoundation"
@@ -6801,7 +6801,7 @@
$as_echo "$ac_res" >&6; }
if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
+ LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
else
as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
@@ -6829,7 +6829,7 @@
$as_echo "$ac_res" >&6; }
if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
+ LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
fi
fi
@@ -12403,7 +12403,7 @@
mingw32*)
CRTLIBS="-lmsvcrt"
- SOCKETLIBS="-L\$(TOPOBJDIR)/dlls/ws2_32 -lws2_32"
+ SOCKETLIBS="-L\$(top_builddir)/dlls/ws2_32 -lws2_32"
;;
esac
@@ -14230,9 +14230,9 @@
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
+ \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec
$ac_file.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
+ \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec
install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x
@@ -14240,7 +14240,7 @@
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD)
- \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
+ \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/dlls/$ac_dir/$ac_dir.spec"
fi
if test "$ac_dir" != "$ac_implib"
@@ -14301,8 +14301,8 @@
ac_name=$2
wine_fn_append_file ALL_TEST_BINARIES $ac_name.exe
wine_fn_append_rule ALL_WINETEST_DEPENDS \
-"$ac_name.exe: \$(TOPOBJDIR)/$ac_dir/$ac_name.exe$DLLEXT
- cp \$(TOPOBJDIR)/$ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@
+"$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT
+ cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@
$ac_name.rc:
echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
$ac_name.res: $ac_name.rc $ac_name.exe"
diff --git a/configure.ac b/configure.ac
index 179d925..559f674 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,11 +217,11 @@
fi
fi
if test -z "$wine_cv_toolsdir"; then
- wine_cv_toolsdir="\$(TOPOBJDIR)"
+ wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
case "$wine_cv_toolsdir" in
/*) ;;
- *) wine_cv_toolsdir="\$(TOPOBJDIR)/$wine_cv_toolsdir" ;;
+ *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac
else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
@@ -271,7 +271,7 @@
dnl Prepend src dir to install path dir if it's a relative path
case "$INSTALL" in
[[\\/$]]* | ?:[[\\/]]* ) ;;
- *) INSTALL="\\\$(TOPSRCDIR)/$INSTALL" ;;
+ *) INSTALL="\\\$(top_srcdir)/$INSTALL" ;;
esac
dnl Check for lint
@@ -691,7 +691,7 @@
LIBWINE_LDFLAGS="-multiply_defined suppress"
LDSHARED="\$(CC) -dynamiclib"
STRIP="$STRIP -x"
- LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
+ LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
dnl declare needed frameworks
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
@@ -779,10 +779,10 @@
WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
[LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
+ LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"],
[WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
[LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
+ LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])])
WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
[LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
@@ -1787,7 +1787,7 @@
case $host_os in
mingw32*)
AC_SUBST(CRTLIBS,"-lmsvcrt")
- AC_SUBST(SOCKETLIBS,"-L\$(TOPOBJDIR)/dlls/ws2_32 -lws2_32")
+ AC_SUBST(SOCKETLIBS,"-L\$(top_builddir)/dlls/ws2_32 -lws2_32")
;;
esac
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 6e9419a..3a9af70 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -23,7 +23,7 @@
all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT)
$(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(OBJS) Makefile.in
- $(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+ $(WINEGCC) -shared $(srcdir)/$(MAINSPEC) $(OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
# Rules for import libraries
@@ -36,7 +36,7 @@
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
$(IMPORTLIB:%=lib%.def): $(MAINSPEC)
- $(WINEBUILD) $(IMPLIBFLAGS) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
+ $(WINEBUILD) $(IMPLIBFLAGS) -w --def -o $@ --export $(srcdir)/$(MAINSPEC)
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(RM) $@
@@ -44,24 +44,24 @@
$(RANLIB) $@
$(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_OBJS)
- $(WINEBUILD) $(IMPLIBFLAGS) -w --implib -o $@ --export $(SRCDIR)/$(MAINSPEC) $(IMPLIB_OBJS)
+ $(WINEBUILD) $(IMPLIBFLAGS) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_OBJS)
$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_CROSSOBJS)
- $(WINEBUILD) $(IMPLIBFLAGS) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(SRCDIR)/$(MAINSPEC) $(IMPLIB_CROSSOBJS)
+ $(WINEBUILD) $(IMPLIBFLAGS) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_CROSSOBJS)
# Rules for auto documentation
manpages:: $(C_SRCS) dummy
- $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -C$(SRCDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(C_SRCS)
+ $(C2MAN) -o $(top_builddir)/documentation/man$(api_manext) -R$(top_builddir) -C$(srcdir) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(C_SRCS)
htmlpages:: $(C_SRCS) dummy
- $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS)
+ $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS)
sgmlpages:: $(C_SRCS) dummy
- $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS)
+ $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS)
xmlpages:: $(C_SRCS) dummy
- $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide-xml -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS)
+ $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS)
# Rules for installation
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index 596b9f7..7d27c53 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -2,7 +2,7 @@
IMPORTLIB = crtdll
IMPORTS = msvcrt
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
crtdll_main.c
diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in
index 91964ef..e727fd3 100644
--- a/dlls/msvcp90/Makefile.in
+++ b/dlls/msvcp90/Makefile.in
@@ -1,7 +1,7 @@
MODULE = msvcp90.dll
IMPORTS = msvcrt
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
exception.c \
diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in
index 872d736..aa8a524 100644
--- a/dlls/msvcp90/tests/Makefile.in
+++ b/dlls/msvcp90/tests/Makefile.in
@@ -1,7 +1,7 @@
TESTDLL = msvcp90.dll
APPMODE = -mno-cygwin
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
misc.c \
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in
index a9d84e5..22a2a5ba 100644
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -1,7 +1,7 @@
MODULE = msvcr100.dll
IMPORTS = msvcrt
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
msvcr100.c
diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in
index f0ecfcb..67c7d09 100644
--- a/dlls/msvcr90/Makefile.in
+++ b/dlls/msvcr90/Makefile.in
@@ -1,7 +1,7 @@
MODULE = msvcr90.dll
IMPORTS = msvcrt
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
msvcr90.c
diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in
index e1209f1..a2093e7 100644
--- a/dlls/msvcr90/tests/Makefile.in
+++ b/dlls/msvcr90/tests/Makefile.in
@@ -1,7 +1,7 @@
TESTDLL = msvcr90.dll
APPMODE = -mno-cygwin
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
msvcr90.c
diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in
index 9144f49..2bb7990 100644
--- a/dlls/msvcrt/tests/Makefile.in
+++ b/dlls/msvcrt/tests/Makefile.in
@@ -1,7 +1,7 @@
TESTDLL = msvcrt.dll
APPMODE = -mno-cygwin
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/..
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt -I$(srcdir)/..
C_SRCS = \
cpp.c \
diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in
index f821c6b..b9e4ead 100644
--- a/dlls/msvcrtd/Makefile.in
+++ b/dlls/msvcrtd/Makefile.in
@@ -2,7 +2,7 @@
IMPORTLIB = msvcrtd
IMPORTS = msvcrt
MODCFLAGS = @BUILTINFLAG@
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \
debug.c
diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in
index 8ef291f..7638380 100644
--- a/dlls/msvcrtd/tests/Makefile.in
+++ b/dlls/msvcrtd/tests/Makefile.in
@@ -1,6 +1,6 @@
TESTDLL = msvcrtd.dll
APPMODE = -mno-cygwin
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
MODCFLAGS = @BUILTINFLAG@
C_SRCS = \
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 26a35e9..f77fad6 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -109,9 +109,9 @@
@MAKE_DLL_RULES@
-authors.c: $(TOPSRCDIR)/AUTHORS
+authors.c: $(top_srcdir)/AUTHORS
(LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \
- sed -e '1,2d' -e 's/\(.*\)/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \
+ sed -e '1,2d' -e 's/\(.*\)/ \"\1\",/' $(top_srcdir)/AUTHORS && \
echo ' 0 };') >$@ || ($(RM) $@ && false)
clean::
diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in
index ec401b8..b57b4d5 100644
--- a/dlls/wineps.drv/Makefile.in
+++ b/dlls/wineps.drv/Makefile.in
@@ -94,7 +94,7 @@
@MAKE_DLL_RULES@
install-ppd:: $(DESTDIR)$(datadir)/wine dummy
- $(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd
+ $(INSTALL_DATA) $(srcdir)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd
.PHONY: install-ppd
diff --git a/documentation/Makefile.in b/documentation/Makefile.in
index a2807ed..5b641cf 100644
--- a/documentation/Makefile.in
+++ b/documentation/Makefile.in
@@ -3,7 +3,7 @@
@MAKE_RULES@
install-man:: $(DESTDIR)$(mandir)/man$(api_manext)
- @cd $(TOPOBJDIR) && $(MAKE) manpages
+ @cd $(top_builddir) && $(MAKE) manpages
for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
clean::
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index 799598a..50d812c 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -54,127 +54,127 @@
@MAKE_RULES@
coure.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1252,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8
couree.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1250,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8
courer.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1251,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8
coureg.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1253,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8
couret.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1254,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8
coue1255.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1255,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8
coue1256.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1256,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8
coue1257.fon: courier.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1257,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8
sserife.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
sserifee.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1250,5 16,1250,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7
sserifer.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
sserifeg.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
sserifet.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
ssee1255.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
ssee1256.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
ssee1257.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
ssee874.fon: ms_sans_serif.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
smalle.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1252,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5
smallee.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1250,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5
smaller.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1251,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5
smalleg.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1253,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5
smallet.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1254,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5
smae1255.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1255,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5
smae1256.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1256,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5
smae1257.fon: small_fonts.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1257,5
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5
jsmalle.fon: small_fonts_jp.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts_jp.ttf 11,932,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7
vgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1252,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7
vgasyse.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1250,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7
vgasysr.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1251,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7
vgasysg.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1253,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7
vgasyst.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1254,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7
vgas1255.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1255,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7
vgas1256.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1256,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7
vgas1257.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1257,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7
vgas874.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,874,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7
jvgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 18,932,8
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8
svgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,936,7 16,1252,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7
hvgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,949,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7
cvgasys.fon: system.ttf
- $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,950,7 16,1252,7
+ $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7
$(BITMAP_FONTS): $(SFNT2FNT)
install install-lib:: $(FONTS) $(INSTALLDIRS)
for i in $(BITMAP_FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
- for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(SRCDIR)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
+ for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
uninstall::
-cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS)
diff --git a/include/Makefile.in b/include/Makefile.in
index 316a467..391cef7 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -561,9 +561,9 @@
install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS)
for f in $(SRCDIR_INCLUDES); do case $$f in \
- wine/*) $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \
- msvcrt/*) $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/$$f ;; \
- *) $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/windows/$$f ;; \
+ wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \
+ msvcrt/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/$$f ;; \
+ *) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/windows/$$f ;; \
esac; done
for f in $(OBJDIR_INCLUDES); do case $$f in \
wine/*) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 8ed360e..359382f 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -1,6 +1,6 @@
DLLFLAGS = @DLLFLAGS@
MODULE = libwine.$(LIBEXT)
-VERSCRIPT = $(SRCDIR)/wine.map
+VERSCRIPT = $(srcdir)/wine.map
EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@
DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
@@ -109,7 +109,7 @@
-DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\"
config.o: config.c $(RELPATH)
- $(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS)
+ $(CC) -c $(ALLCFLAGS) -o $@ $(srcdir)/config.c $(CONFIGDIRS)
# Linking rules
@@ -123,10 +123,10 @@
$(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@
libwine.a: wine.def
- $(DLLTOOL) -l $@ -d $(SRCDIR)/wine.def
+ $(DLLTOOL) -l $@ -d $(srcdir)/wine.def
libwine.dll: $(OBJS) wine.def Makefile.in
- $(DLLWRAP) --def $(SRCDIR)/wine.def -o $@ $(OBJS) $(EXTRALIBS)
+ $(DLLWRAP) --def $(srcdir)/wine.def -o $@ $(OBJS) $(EXTRALIBS)
DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION)
@@ -171,7 +171,7 @@
libwine.so.$(SOVERSION) libwine.dylib libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib
version.c: dummy
- version=`(GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
clean::
$(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index c2cc3dc..9cb7f0f 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -1,7 +1,7 @@
MODULE = notepad.exe
APPMODE = -mwindows -mno-cygwin
IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
MODCFLAGS = @BUILTINFLAG@
EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index c5dac55..a388be3 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -2,7 +2,7 @@
APPMODE = -mwindows -mno-cygwin
IMPORTS = advapi32
DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
EXTRADEFS = -DNO_LIBWINE_PORT
MODCFLAGS = @BUILTINFLAG@
diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in
index ddb0bbb..3307cb5 100644
--- a/programs/taskmgr/Makefile.in
+++ b/programs/taskmgr/Makefile.in
@@ -1,7 +1,7 @@
MODULE = taskmgr.exe
APPMODE = -mwindows -mno-cygwin
IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
EXTRADEFS = -DNO_LIBWINE_PORT
MODCFLAGS = @BUILTINFLAG@
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index a990ee9..6d8f9b4 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -24,7 +24,7 @@
$(RM) build.nfo winetest-dist.exe $(TESTBINS) $(TESTRCS)
build.rc: dummy
- build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
+ build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
build.nfo:
-$(CC) -v 2>$@
diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in
index e36663b..767fc33 100644
--- a/programs/wordpad/Makefile.in
+++ b/programs/wordpad/Makefile.in
@@ -1,7 +1,7 @@
MODULE = wordpad.exe
APPMODE = -mwindows -mno-cygwin
IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
EXTRADEFS = -DNO_LIBWINE_PORT
MODCFLAGS = @BUILTINFLAG@
diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in
index 0faba35..764ded5 100644
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@@ -2,7 +2,7 @@
MODULE = xcopy.exe
APPMODE = -mconsole -municode -mno-cygwin
IMPORTS = shell32 user32
-EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
+EXTRAINCL = -I$(top_srcdir)/include/msvcrt
MODCFLAGS = @BUILTINFLAG@
C_SRCS = \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d5f848b..7499d4a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -59,19 +59,19 @@
$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) $(LDRPATH_LOCAL)
wine.inf: wine.inf.in
- LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.inf.in >$@ || ($(RM) $@ && false)
+ LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false)
wineapploader: wineapploader.in
- sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
+ sed -e 's,@bindir\@,$(bindir),g' $(srcdir)/wineapploader.in >$@ || ($(RM) $@ && false)
install install-lib:: wine.inf $(INSTALLDIRS)
$(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf
- $(INSTALL_DATA) $(SRCDIR)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls
- $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
+ $(INSTALL_DATA) $(srcdir)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls
+ $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
-$(UPDATE_DESKTOP_DATABASE)
install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
- $(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker
+ $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
$(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
$(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
$(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in
index a1844b8..ecc4da7 100644
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@ -36,7 +36,7 @@
install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
$(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT)
$(INSTALL_DATA) winedump.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext)
- $(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl
+ $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl
uninstall::
$(RM) $(DESTDIR)$(bindir)/function_grep.pl $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext)
