ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Expand srcdir directly into the top-level makefile.

This commit is contained in:
Alexandre Julliard 2013-10-28 11:44:59 +01:00
parent 3571c06799
commit 0dcc1cc3e8
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aclocal.m4 vendored
View File

@ -433,7 +433,7 @@ $ac_dir/uninstall::
"__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: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
.PHONY: $ac_dir/install-dev $ac_dir/uninstall .PHONY: $ac_dir/install-dev $ac_dir/uninstall
@ -466,9 +466,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
wine_fn_append_rule \ wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec
$ac_file.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec
.PHONY: $ac_dir/install-dev $ac_dir/uninstall .PHONY: $ac_dir/install-dev $ac_dir/uninstall
$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
@ -481,7 +481,7 @@ __uninstall__: $ac_dir/uninstall"
wine_fn_append_rule \ wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec" \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec"
fi fi
if test "$ac_name" != "$ac_implib" if test "$ac_name" != "$ac_implib"

25
configure vendored
View File

@ -5834,6 +5834,7 @@ then
MAINTAINER_MODE=\# MAINTAINER_MODE=\#
else else
test "$srcdir" = . || as_fn_error $? "Maintainer mode cannot work out of tree." "$LINENO" 5
if test "$FONTFORGE" = "false"; then as_fn_error $? "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5; fi if test "$FONTFORGE" = "false"; then as_fn_error $? "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5; fi
if test "$RSVG" = "false"; then as_fn_error $? "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5; fi if test "$RSVG" = "false"; then as_fn_error $? "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5; fi
@ -16350,7 +16351,7 @@ fi
"__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: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec
$ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
.PHONY: $ac_dir/install-dev $ac_dir/uninstall .PHONY: $ac_dir/install-dev $ac_dir/uninstall
@ -16383,9 +16384,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
wine_fn_append_rule \ wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec
$ac_file.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec
.PHONY: $ac_dir/install-dev $ac_dir/uninstall .PHONY: $ac_dir/install-dev $ac_dir/uninstall
$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
@ -16398,7 +16399,7 @@ __uninstall__: $ac_dir/uninstall"
wine_fn_append_rule \ wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/$ac_name.spec $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)/$ac_dir/$ac_name.spec" \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec"
fi fi
if test "$ac_name" != "$ac_implib" if test "$ac_name" != "$ac_implib"
@ -17419,11 +17420,11 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in"
if test "x$enable_maintainer_mode" = xyes if test "x$enable_maintainer_mode" = xyes
then then
wine_fn_append_rule "\$(srcdir)/configure: configure.ac aclocal.m4 wine_fn_append_rule "configure: configure.ac aclocal.m4
cd \$(srcdir) && autoconf --warnings=all autoconf --warnings=all
\$(srcdir)/include/config.h.in: include/stamp-h.in include/config.h.in: include/stamp-h.in
\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 include/stamp-h.in: configure.ac aclocal.m4
cd \$(srcdir) && autoheader --warnings=all autoheader --warnings=all
@echo timestamp > \$@" @echo timestamp > \$@"
fi fi
@ -17431,9 +17432,9 @@ if test "x$with_gettextpo" = xyes
then then
test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5 test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5
wine_fn_append_rule "ALL_POT_FILES =$ALL_POT_FILES wine_fn_append_rule "ALL_POT_FILES =$ALL_POT_FILES
\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot \$(LINGUAS:%=po/%.po): po/wine.pot
msgmerge --previous -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ msgmerge --previous -q \$@ po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
\$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) po/wine.pot: \$(ALL_POT_FILES)
msgcat -o \$@ \$(ALL_POT_FILES)" msgcat -o \$@ \$(ALL_POT_FILES)"
fi fi

17
configure.ac
View File

@ -280,6 +280,7 @@ if test "x$enable_maintainer_mode" != "xyes"
then then
AC_SUBST([MAINTAINER_MODE],[\#]) AC_SUBST([MAINTAINER_MODE],[\#])
else else
test "$srcdir" = . || AC_MSG_ERROR([Maintainer mode cannot work out of tree.])
if test "$FONTFORGE" = "false"; then AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]); fi if test "$FONTFORGE" = "false"; then AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]); fi
if test "$RSVG" = "false"; then AC_MSG_ERROR([You need rsvg to rebuild icons in maintainer mode.]); fi if test "$RSVG" = "false"; then AC_MSG_ERROR([You need rsvg to rebuild icons in maintainer mode.]); fi
@ -3462,11 +3463,11 @@ dnl Some final makefile rules
if test "x$enable_maintainer_mode" = xyes if test "x$enable_maintainer_mode" = xyes
then then
WINE_APPEND_RULE( WINE_APPEND_RULE(
[\$(srcdir)/configure: configure.ac aclocal.m4 [configure: configure.ac aclocal.m4
cd \$(srcdir) && autoconf --warnings=all autoconf --warnings=all
\$(srcdir)/include/config.h.in: include/stamp-h.in include/config.h.in: include/stamp-h.in
\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 include/stamp-h.in: configure.ac aclocal.m4
cd \$(srcdir) && autoheader --warnings=all autoheader --warnings=all
@echo timestamp > \$[@]]) @echo timestamp > \$[@]])
fi fi
@ -3475,9 +3476,9 @@ then
test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.]) test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.])
WINE_APPEND_RULE( WINE_APPEND_RULE(
[ALL_POT_FILES =$ALL_POT_FILES [ALL_POT_FILES =$ALL_POT_FILES
\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot \$(LINGUAS:%=po/%.po): po/wine.pot
msgmerge --previous -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@] msgmerge --previous -q \$[@] po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
\$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) po/wine.pot: \$(ALL_POT_FILES)
msgcat -o \$[@] \$(ALL_POT_FILES)]) msgcat -o \$[@] \$(ALL_POT_FILES)])
fi fi