configure: Make the ac_dir variable contain the full directory name for all types of make rules.

oldstable
Alexandre Julliard 2010-09-25 12:01:14 +02:00
parent c57aa38e86
commit 52c9e85b19
2 changed files with 126 additions and 120 deletions

123
aclocal.m4 vendored
View File

@ -164,26 +164,27 @@ wine_fn_append_rule ()
wine_fn_all_dir_rules () wine_fn_all_dir_rules ()
{ {
ac_makedep="" ac_dir=$[1]
if test "$[1]" != tools ac_alldeps=$[2]
if test $ac_dir != tools
then then
dnl makedep is in tools so tools makefile cannot depend on it dnl makedep is in tools so tools makefile cannot depend on it
ac_makedep=" \$(MAKEDEP)" ac_alldeps="$[2] \$(MAKEDEP)"
fi fi
wine_fn_append_file ALL_DIRS $[1] wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__clean__: $[1]/__clean__ "__clean__: $ac_dir/__clean__
.PHONY: $[1]/__clean__ .PHONY: $ac_dir/__clean__
$[1]/__clean__: $[1]/Makefile $ac_dir/__clean__: $ac_dir/Makefile
@cd $[1] && \$(MAKE) clean @cd $ac_dir && \$(MAKE) clean
\$(RM) $[1]/Makefile \$(RM) $ac_dir/Makefile
$[1]/Makefile: $[1]/Makefile.in Make.vars.in config.status $[2]$ac_makedep $ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps
@./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend
depend: $[1]/__depend__ depend: $ac_dir/__depend__
.PHONY: $[1]/__depend__ .PHONY: $ac_dir/__depend__
$[1]/__depend__: $[2] \$(MAKEDEP) dummy $ac_dir/__depend__: $[2] \$(MAKEDEP) dummy
@./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend" @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend"
} }
wine_fn_config_makefile () wine_fn_config_makefile ()
@ -225,78 +226,79 @@ uninstall:: $ac_dir/Makefile
wine_fn_config_dll () wine_fn_config_dll ()
{ {
ac_dir=$[1] ac_name=$[1]
ac_dir=dlls/$ac_name
ac_enable=$[2] ac_enable=$[2]
ac_implib=$[3] ac_implib=$[3]
ac_implibsrc=$[4] ac_implibsrc=$[4]
ac_file="dlls/$ac_dir/lib$ac_implib" ac_file=$ac_dir/lib$ac_implib
ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_deps="tools/widl tools/winebuild tools/winegcc include"
ac_implibflags="" ac_implibflags=""
case $ac_dir in case $ac_name in
*16) ac_implibflags=" -m16" ;; *16) ac_implibflags=" -m16" ;;
esac esac
wine_fn_all_dir_rules dlls/$ac_dir dlls/Makedll.rules wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules
AS_VAR_IF([$ac_enable],[no], AS_VAR_IF([$ac_enable],[no],
dnl enable_win16 is special in that it disables import libs too dnl enable_win16 is special in that it disables import libs too
[test "$ac_enable" != enable_win16 || return 0], [test "$ac_enable" != enable_win16 || return 0],
[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: dlls/$ac_dir "all: $ac_dir
.PHONY: dlls/$ac_dir .PHONY: $ac_dir
dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy $ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd dlls/$ac_dir && \$(MAKE) @cd $ac_dir && \$(MAKE)
install:: dlls/$ac_dir/Makefile __builddeps__ install:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install @cd $ac_dir && \$(MAKE) install
install-lib:: dlls/$ac_dir/Makefile __builddeps__ install-lib:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-lib @cd $ac_dir && \$(MAKE) install-lib
uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile uninstall manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) \$[@]"]) @cd $ac_dir && \$(MAKE) \$[@]"])
if test -n "$ac_implibsrc" if test -n "$ac_implibsrc"
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.def @cd $ac_dir && \$(MAKE) lib$ac_implib.def
$ac_file.$STATIC_IMPLIBEXT: dlls/$ac_dir/Makefile dummy $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
install-dev:: dlls/$ac_dir/Makefile __builddeps__ install-dev:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev" @cd $ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/Makefile dummy $ac_file.cross.a: $ac_dir/Makefile dummy
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a"
fi fi
elif test -n "$ac_implib" elif test -n "$ac_implib"
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD) $ac_file.def: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec
$ac_file.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD) $ac_file.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec
install-dev:: dlls/$ac_dir/Makefile __builddeps__ install-dev:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev" @cd $ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD) $ac_file.cross.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec"
fi fi
if test "$ac_dir" != "$ac_implib" if test "$ac_name" != "$ac_implib"
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT "__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
\$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$[@] \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$[@]
clean:: clean::
\$(RM) dlls/lib$ac_implib.$IMPLIBEXT" \$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
@ -304,7 +306,7 @@ clean::
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: dlls/lib$ac_implib.cross.a "__builddeps__: dlls/lib$ac_implib.cross.a
dlls/lib$ac_implib.cross.a: $ac_file.cross.a dlls/lib$ac_implib.cross.a: $ac_file.cross.a
\$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$[@]" \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@]"
fi fi
fi fi
fi fi
@ -312,30 +314,31 @@ dlls/lib$ac_implib.cross.a: $ac_file.cross.a
wine_fn_config_program () wine_fn_config_program ()
{ {
ac_dir=$[1] ac_name=$[1]
ac_dir=programs/$ac_name
ac_enable=$[2] ac_enable=$[2]
ac_install=$[3] ac_install=$[3]
wine_fn_all_dir_rules programs/$ac_dir programs/Makeprog.rules wine_fn_all_dir_rules $ac_dir programs/Makeprog.rules
AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: programs/$ac_dir "all: $ac_dir
.PHONY: programs/$ac_dir .PHONY: $ac_dir
programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy $ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE)" @cd $ac_dir && \$(MAKE)"
test -n "$ac_install" || return test -n "$ac_install" || return
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs/$ac_dir/Makefile __builddeps__ "install install-lib:: $ac_dir/Makefile __builddeps__
@cd programs/$ac_dir && \$(MAKE) install @cd $ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile uninstall:: $ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall" @cd $ac_dir && \$(MAKE) uninstall"
if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: tools \$(DESTDIR)\$(bindir) "install install-lib:: tools \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
uninstall:: uninstall::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" \$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
fi]) fi])
} }

123
configure vendored
View File

@ -14125,25 +14125,26 @@ wine_fn_append_rule ()
wine_fn_all_dir_rules () wine_fn_all_dir_rules ()
{ {
ac_makedep="" ac_dir=$1
if test "$1" != tools ac_alldeps=$2
if test $ac_dir != tools
then then
ac_makedep=" \$(MAKEDEP)" ac_alldeps="$2 \$(MAKEDEP)"
fi fi
wine_fn_append_file ALL_DIRS $1 wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__clean__: $1/__clean__ "__clean__: $ac_dir/__clean__
.PHONY: $1/__clean__ .PHONY: $ac_dir/__clean__
$1/__clean__: $1/Makefile $ac_dir/__clean__: $ac_dir/Makefile
@cd $1 && \$(MAKE) clean @cd $ac_dir && \$(MAKE) clean
\$(RM) $1/Makefile \$(RM) $ac_dir/Makefile
$1/Makefile: $1/Makefile.in Make.vars.in config.status $2$ac_makedep $ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps
@./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend
depend: $1/__depend__ depend: $ac_dir/__depend__
.PHONY: $1/__depend__ .PHONY: $ac_dir/__depend__
$1/__depend__: $2 \$(MAKEDEP) dummy $ac_dir/__depend__: $2 \$(MAKEDEP) dummy
@./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend" @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend"
} }
wine_fn_config_makefile () wine_fn_config_makefile ()
@ -14187,34 +14188,35 @@ uninstall:: $ac_dir/Makefile
wine_fn_config_dll () wine_fn_config_dll ()
{ {
ac_dir=$1 ac_name=$1
ac_dir=dlls/$ac_name
ac_enable=$2 ac_enable=$2
ac_implib=$3 ac_implib=$3
ac_implibsrc=$4 ac_implibsrc=$4
ac_file="dlls/$ac_dir/lib$ac_implib" ac_file=$ac_dir/lib$ac_implib
ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_deps="tools/widl tools/winebuild tools/winegcc include"
ac_implibflags="" ac_implibflags=""
case $ac_dir in case $ac_name in
*16) ac_implibflags=" -m16" ;; *16) ac_implibflags=" -m16" ;;
esac esac
wine_fn_all_dir_rules dlls/$ac_dir dlls/Makedll.rules wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules
if eval test \"x\$"$ac_enable"\" = x"no"; then : if eval test \"x\$"$ac_enable"\" = x"no"; then :
test "$ac_enable" != enable_win16 || return 0 test "$ac_enable" != enable_win16 || return 0
else else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: dlls/$ac_dir "all: $ac_dir
.PHONY: dlls/$ac_dir .PHONY: $ac_dir
dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy $ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd dlls/$ac_dir && \$(MAKE) @cd $ac_dir && \$(MAKE)
install:: dlls/$ac_dir/Makefile __builddeps__ install:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install @cd $ac_dir && \$(MAKE) install
install-lib:: dlls/$ac_dir/Makefile __builddeps__ install-lib:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-lib @cd $ac_dir && \$(MAKE) install-lib
uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile uninstall manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) \$@" @cd $ac_dir && \$(MAKE) \$@"
fi fi
if test -n "$ac_implibsrc" if test -n "$ac_implibsrc"
@ -14222,44 +14224,44 @@ fi
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.def @cd $ac_dir && \$(MAKE) lib$ac_implib.def
$ac_file.$STATIC_IMPLIBEXT: dlls/$ac_dir/Makefile dummy $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
install-dev:: dlls/$ac_dir/Makefile __builddeps__ install-dev:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev" @cd $ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/Makefile dummy $ac_file.cross.a: $ac_dir/Makefile dummy
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a"
fi fi
elif test -n "$ac_implib" elif test -n "$ac_implib"
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD) $ac_file.def: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec
$ac_file.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD) $ac_file.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec
install-dev:: dlls/$ac_dir/Makefile __builddeps__ install-dev:: $ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev" @cd $ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile \$(WINEBUILD) $ac_file.cross.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec"
fi fi
if test "$ac_dir" != "$ac_implib" if test "$ac_name" != "$ac_implib"
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT "__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
\$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$@ \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@
clean:: clean::
\$(RM) dlls/lib$ac_implib.$IMPLIBEXT" \$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
@ -14267,7 +14269,7 @@ clean::
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: dlls/lib$ac_implib.cross.a "__builddeps__: dlls/lib$ac_implib.cross.a
dlls/lib$ac_implib.cross.a: $ac_file.cross.a dlls/lib$ac_implib.cross.a: $ac_file.cross.a
\$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$@" \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@"
fi fi
fi fi
fi fi
@ -14275,33 +14277,34 @@ dlls/lib$ac_implib.cross.a: $ac_file.cross.a
wine_fn_config_program () wine_fn_config_program ()
{ {
ac_dir=$1 ac_name=$1
ac_dir=programs/$ac_name
ac_enable=$2 ac_enable=$2
ac_install=$3 ac_install=$3
wine_fn_all_dir_rules programs/$ac_dir programs/Makeprog.rules wine_fn_all_dir_rules $ac_dir programs/Makeprog.rules
if eval test \"x\$"$ac_enable"\" = x"no"; then : if eval test \"x\$"$ac_enable"\" = x"no"; then :
else else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: programs/$ac_dir "all: $ac_dir
.PHONY: programs/$ac_dir .PHONY: $ac_dir
programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy $ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE)" @cd $ac_dir && \$(MAKE)"
test -n "$ac_install" || return test -n "$ac_install" || return
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs/$ac_dir/Makefile __builddeps__ "install install-lib:: $ac_dir/Makefile __builddeps__
@cd programs/$ac_dir && \$(MAKE) install @cd $ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile uninstall:: $ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall" @cd $ac_dir && \$(MAKE) uninstall"
if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: tools \$(DESTDIR)\$(bindir) "install install-lib:: tools \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
uninstall:: uninstall::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" \$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
fi fi
fi fi
} }