commit bd9852cd6f9c4080a283a2bee71ea38ae6ea7029
author Alexandre Julliard <julliard@winehq.org> Sun Sep 19 12:40:12 2010 +0200
committer Alexandre Julliard <julliard@winehq.org> Sun Sep 19 12:40:12 2010 +0200
tree e1b844b2e0693725d114d5588cd33813c79dd4de
parent 81b8ee863e1d22e7e169c98e660ad5a6ea7b6ec4

makefiles: Rename the SRCDIR, TOPSRCDIR and TOPOBJDIR variables to follow autoconf conventions.

configure.ac

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