makefiles: Create the wine symlink from configure.

This commit is contained in:
Alexandre Julliard 2010-02-03 13:12:12 +01:00
parent 03e01a2987
commit 7d020c9f08
6 changed files with 61 additions and 10 deletions

View File

@ -65,7 +65,6 @@ TARGETFLAGS = @TARGETFLAGS@
WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS)
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
C2MAN = $(TOPSRCDIR)/tools/c2man.pl C2MAN = $(TOPSRCDIR)/tools/c2man.pl
RUNTEST = $(TOPSRCDIR)/tools/runtest RUNTEST = $(TOPSRCDIR)/tools/runtest
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT)

View File

@ -26,7 +26,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = none MODULE = none
PROGRAMS = wine
# Sub-directories to run make depend/clean into # Sub-directories to run make depend/clean into
SUBDIRS = \ SUBDIRS = \
@ -46,7 +45,7 @@ INSTALLSUBDIRS = @ALL_TOP_DIRS@
# Sub-directories to run make test into # Sub-directories to run make test into
TESTSUBDIRS = dlls TESTSUBDIRS = dlls
all: Make.rules $(PROGRAMS) all: wine
@echo "Wine build complete." @echo "Wine build complete."
WINAPI_CHECK_EXTRA_FLAGS = --global WINAPI_CHECK_EXTRA_FLAGS = --global
@ -68,9 +67,6 @@ include/config.h: include/stamp-h
include/stamp-h: include/config.h.in config.status include/stamp-h: include/config.h.in config.status
@./config.status include/config.h include/stamp-h @./config.status include/config.h include/stamp-h
wine: $(WINEWRAPPER)
$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
# Installation rules # Installation rules
uninstall:: uninstall::
@ -138,10 +134,10 @@ distclean:: clean
# Makefile rules # Makefile rules
ALL_MAKERULES = @ALL_MAKERULES@
ALL_MAKEFILES = @ALL_MAKEFILES@ ALL_MAKEFILES = @ALL_MAKEFILES@
ALL_CONFIGS = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@
Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): $(ALL_CONFIGS):
@./config.status $@ @./config.status $@
.INIT: Makefile .INIT: Makefile
.BEGIN: Makefile .BEGIN: Makefile
@ -150,6 +146,6 @@ Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES):
$(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) $(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES)
distclean:: distclean::
$(RM) Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES) $(RM) $(ALL_CONFIGS)
@ALL_MAKEFILE_DEPENDS@ @ALL_MAKEFILE_DEPENDS@

8
aclocal.m4 vendored
View File

@ -142,6 +142,14 @@ dnl
AC_DEFUN([WINE_CONFIG_EXTRA_DIR], AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
[AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])])
dnl **** Create symlinks from config.status ****
dnl
dnl Usage: WINE_CONFIG_SYMLINK(name,target)
dnl
AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl
ALL_SYMLINKS="$ALL_SYMLINKS \\
$1"])
dnl **** Create a make rules file from config.status **** dnl **** Create a make rules file from config.status ****
dnl dnl
dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps)

46
configure vendored
View File

@ -608,6 +608,7 @@ ALL_IMPLIB_DIRS
ALL_DLL_DIRS ALL_DLL_DIRS
ALL_TOP_DIRS ALL_TOP_DIRS
ALL_MAKEFILE_DEPENDS ALL_MAKEFILE_DEPENDS
ALL_SYMLINKS
ALL_MAKEFILES ALL_MAKEFILES
ALL_MAKERULES ALL_MAKERULES
DEPENDENCIES DEPENDENCIES
@ -13653,6 +13654,8 @@ ALL_MAKERULES=""
ALL_MAKEFILES="" ALL_MAKEFILES=""
ALL_SYMLINKS=""
ALL_MAKEFILE_DEPENDS="# Makefile dependencies" ALL_MAKEFILE_DEPENDS="# Makefile dependencies"
@ -13682,6 +13685,10 @@ ALL_PROGRAM_BIN_INSTALL_DIRS=""
ac_config_commands="$ac_config_commands include/stamp-h" ac_config_commands="$ac_config_commands include/stamp-h"
ac_config_links="$ac_config_links wine:tools/winewrapper"
ALL_SYMLINKS="$ALL_SYMLINKS \\
wine"
ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv"
ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv" ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv"
@ -19438,6 +19445,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for. # Files that config.status was made for.
config_files="$ac_config_files" config_files="$ac_config_files"
config_headers="$ac_config_headers" config_headers="$ac_config_headers"
config_links="$ac_config_links"
config_commands="$ac_config_commands" config_commands="$ac_config_commands"
_ACEOF _ACEOF
@ -19468,6 +19476,9 @@ $config_files
Configuration headers: Configuration headers:
$config_headers $config_headers
Configuration links:
$config_links
Configuration commands: Configuration commands:
$config_commands $config_commands
@ -19596,6 +19607,7 @@ do
case $ac_config_target in case $ac_config_target in
"include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
"include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;;
"wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;;
"dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;;
"dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;;
"dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;;
@ -20159,6 +20171,7 @@ done
if $ac_need_defaults; then if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi fi
@ -20480,7 +20493,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_HEADERS" fi # test -n "$CONFIG_HEADERS"
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS"
shift shift
for ac_tag for ac_tag
do do
@ -20721,7 +20734,38 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
|| as_fn_error "could not create -" "$LINENO" 5 || as_fn_error "could not create -" "$LINENO" 5
fi fi
;; ;;
:L)
#
# CONFIG_LINK
#
if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
:
else
# Prefer the file from the source tree if names are identical.
if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
ac_source=$srcdir/$ac_source
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
if test ! -r "$ac_source"; then
as_fn_error "$ac_source: file not found" "$LINENO" 5
fi
rm -f "$ac_file"
# Try a relative symlink, then a hard link, then a copy.
case $srcdir in
[\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
*) ac_rel_source=$ac_top_build_prefix$ac_source ;;
esac
ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
ln "$ac_source" "$ac_file" 2>/dev/null ||
cp -p "$ac_source" "$ac_file" ||
as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
fi
;;
:C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;} $as_echo "$as_me: executing $ac_file commands" >&6;}
;; ;;

View File

@ -2096,6 +2096,7 @@ Makefile: dummy
AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_MAKEFILES,"") AC_SUBST(ALL_MAKEFILES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_TOP_DIRS,"")
@ -2113,6 +2114,8 @@ AH_TOP([#define __WINE_CONFIG_H])
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls)

View File

@ -86,6 +86,7 @@ my @ignores = (
"/configure.lineno", "/configure.lineno",
"/TAGS", "/TAGS",
"/tags", "/tags",
"/wine",
"Makefile", "Makefile",
"dlldata.c", "dlldata.c",
"dlls/*/*.def", "dlls/*/*.def",