makefiles: Include AUTHORS file directly from the top-level directory.

This commit is contained in:
Alexandre Julliard 2013-11-30 12:43:20 +01:00
parent 67f9b6e3c5
commit bc9650392a
5 changed files with 2 additions and 6 deletions

1
.gitignore vendored
View File

@ -126,7 +126,6 @@ dlls/rpcrt4/tests/server_c.c
dlls/rpcrt4/tests/server_s.c dlls/rpcrt4/tests/server_s.c
dlls/scrrun/scrrun.h dlls/scrrun/scrrun.h
dlls/scrrun/tests/scrrun.h dlls/scrrun/tests/scrrun.h
dlls/shell32/AUTHORS
dlls/sti/sti_wia.h dlls/sti/sti_wia.h
dlls/sti/sti_wia_p.c dlls/sti/sti_wia_p.c
dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon.h

3
configure vendored
View File

@ -16679,8 +16679,6 @@ all: Makefile
Makefile: Makefile.in Make.vars.in Make.rules config.status Makefile: Makefile.in Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile" @./config.status Make.tmp Makefile"
ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS"
wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS
if test "x$enable_fonts" != xno; then if test "x$enable_fonts" != xno; then
ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf"
ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf"
@ -18286,7 +18284,6 @@ 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" ;;
"dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;;
"fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;;
"fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;;
"fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;;

View File

@ -2669,7 +2669,6 @@ all: Makefile
Makefile: Makefile.in Make.vars.in Make.rules config.status Makefile: Makefile.in Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile]) @./config.status Make.tmp Makefile])
WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS])
WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts)
WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls])
WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS])

View File

@ -4,6 +4,8 @@ IMPORTLIB = shell32
IMPORTS = uuid shlwapi user32 gdi32 advapi32 IMPORTS = uuid shlwapi user32 gdi32 advapi32
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32
EXTRALIBS = @CORESERVICESLIB@ EXTRALIBS = @CORESERVICESLIB@
# AUTHORS file is in the top-level directory
EXTRAINCL = -I$(top_srcdir)
C_SRCS = \ C_SRCS = \
appbar.c \ appbar.c \

View File

@ -87,7 +87,6 @@ my @ignores = (
"Makefile", "Makefile",
"dlldata.c", "dlldata.c",
"dlls/*/*.def", "dlls/*/*.def",
"dlls/shell32/AUTHORS",
"*/*/tests/testlist.c", "*/*/tests/testlist.c",
"include/config.h", "include/config.h",
"include/stamp-h", "include/stamp-h",