November 2015 - Wine-commits

Alexandre Julliard : makefiles: Generate makefiles and po rules also for disabled modules.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 3042f720d87bd0590a21163f46e9ffa02595c298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3042f720d87bd0590a21163f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 13:32:24 2015 +0900 makefiles: Generate makefiles and po rules also for disabled modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 9 ++++----- configure | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 774377d..8e047b5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -341,11 +341,9 @@ wine_fn_disabled_rules () ac_extraclean="$ac_dir/Makefile" test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" + wine_fn_depend_rules + wine_fn_clean_rules $ac_clean + wine_fn_pot_rules } wine_fn_config_makefile () @@ -414,6 +412,7 @@ wine_fn_config_dll () then wine_fn_depend_rules wine_fn_clean_rules $ac_clean + wine_fn_pot_rules else wine_fn_disabled_rules $ac_clean return diff --git a/configure b/configure index 4fecf62..43f6b04 100755 --- a/configure +++ b/configure @@ -7523,11 +7523,9 @@ wine_fn_disabled_rules () ac_extraclean="$ac_dir/Makefile" test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" + wine_fn_depend_rules + wine_fn_clean_rules $ac_clean + wine_fn_pot_rules } wine_fn_config_makefile () @@ -7605,6 +7603,7 @@ fi then wine_fn_depend_rules wine_fn_clean_rules $ac_clean + wine_fn_pot_rules else wine_fn_disabled_rules $ac_clean return

1 0

Alexandre Julliard : makefiles: Add support for specifying extra dependencies in libraries and programs.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d1578a61abf41c639be76e5a28ba9cf9de97da91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1578a61abf41c639be76e5a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 14:17:18 2015 +0900 makefiles: Add support for specifying extra dependencies in libraries and programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 +++----- configure.ac | 8 +++----- tools/makedep.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 43f6b04..51a6913 100755 --- a/configure +++ b/configure @@ -7989,8 +7989,7 @@ IMPORTLIB = libwine.a INSTALL_LIB = libwine.dll INSTALL_DEV = libwine.a libwine_LDFLAGS = -shared \$(srcdir)/wine.def - -libwine.dll: \$(srcdir)/wine.def +libwine_DEPS = wine.def " ;; @@ -8239,7 +8238,7 @@ libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dy as_fn_append LOADER_RULES " ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -$wine_binary $wine_binary-installed: wine_info.plist +${wine_binary}_DEPS = wine_info.plist " ;; @@ -8755,8 +8754,7 @@ SHAREDLIB = libwine.so.$libwine_version INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags - -libwine.so.$libwine_version: \$(srcdir)/wine.map +libwine_DEPS = wine.map " diff --git a/configure.ac b/configure.ac index 48268b0..4e9ca89 100644 --- a/configure.ac +++ b/configure.ac @@ -723,8 +723,7 @@ IMPORTLIB = libwine.a INSTALL_LIB = libwine.dll INSTALL_DEV = libwine.a libwine_LDFLAGS = -shared \$(srcdir)/wine.def - -libwine.dll: \$(srcdir)/wine.def +libwine_DEPS = wine.def "]) ;; @@ -853,7 +852,7 @@ libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dy AS_VAR_APPEND([LOADER_RULES],[" ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -$wine_binary $wine_binary-installed: wine_info.plist +${wine_binary}_DEPS = wine_info.plist "]) ;; @@ -955,8 +954,7 @@ SHAREDLIB = libwine.so.$libwine_version INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags - -libwine.so.$libwine_version: \$(srcdir)/wine.map +libwine_DEPS = wine.map "]) AS_VAR_APPEND([LOADER_RULES],[" diff --git a/tools/makedep.c b/tools/makedep.c index 023c0ec..75c7d91 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1866,6 +1866,28 @@ static void get_dependencies( struct strarray *deps, struct incl_file *file, str /******************************************************************* + * get_local_dependencies + * + * Get the local dependencies of a given target. + */ +static struct strarray get_local_dependencies( const struct makefile *make, const char *name, + struct strarray targets ) +{ + unsigned int i; + struct strarray deps = get_expanded_make_var_array( make, file_local_var( name, "DEPS" )); + + for (i = 0; i < deps.count; i++) + { + if (strarray_exists( &targets, deps.str[i] )) + deps.str[i] = obj_dir_path( make, deps.str[i] ); + else + deps.str[i] = src_dir_path( make, deps.str[i] ); + } + return deps; +} + + +/******************************************************************* * add_install_rule */ static void add_install_rule( const struct makefile *make, struct strarray *install_rules, @@ -2018,6 +2040,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar struct strarray mo_files = empty_strarray; struct strarray mc_files = empty_strarray; struct strarray ok_files = empty_strarray; + struct strarray in_files = empty_strarray; struct strarray dlldata_files = empty_strarray; struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; @@ -2224,6 +2247,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar free( dest ); free( dir ); } + strarray_add( &in_files, xstrdup(obj) ); strarray_add( &all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(SED_CMD) %s >$@ || (rm -f $@ && false)\n", source->filename ); @@ -2595,6 +2619,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, object_files ); + output_filenames( get_local_dependencies( make, basename, in_files )); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, object_files ); @@ -2719,6 +2744,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar char *program_installed = NULL; char *program = strmake( "%s%s", make->programs.str[i], exe_ext ); struct strarray all_libs = empty_strarray; + struct strarray deps = get_local_dependencies( make, make->programs.str[i], in_files ); struct strarray objs = get_expanded_make_var_array( make, file_local_var( make->programs.str[i], "OBJS" )); struct strarray symlinks = get_expanded_make_var_array( make, @@ -2727,6 +2753,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar if (!objs.count) objs = object_files; output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs ); + output_filenames( deps ); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, objs ); @@ -2748,6 +2775,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "\n" ); output( "%s:", obj_dir_path( make, program_installed ) ); output_filenames_obj_dir( make, objs ); + output_filenames( deps ); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, objs );

1 0

Alexandre Julliard : makefiles: Generate rules for installing wine.inf.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: b8d138d633b63040880be6ca97cadc95c036703c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d138d633b63040880be6ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 15:16:16 2015 +0900 makefiles: Generate rules for installing wine.inf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++++++------- configure.ac | 16 +++++++++------- tools/makedep.c | 2 ++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 51a6913..0aa17fc 100755 --- a/configure +++ b/configure @@ -7865,6 +7865,7 @@ distclean:: wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" +loader_install="" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` case $host_os in @@ -14979,10 +14980,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte esac ;; esac -as_fn_append LOADER_RULES " -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs -" ac_save_CFLAGS="$CFLAGS" @@ -18321,16 +18318,21 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else + loader_install="$loader_install wine.inf" as_fn_append LOADER_RULES " -install install-lib:: wine.inf - \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf +install install-lib:: \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls " fi +as_fn_append LOADER_RULES " +PROGRAMS = $loader_programs +INSTALL_LIB = $loader_programs$loader_install +" + if test "$srcdir" = . then ac_config_commands="$ac_config_commands .gitignore" diff --git a/configure.ac b/configure.ac index 4e9ca89..685b346 100644 --- a/configure.ac +++ b/configure.ac @@ -688,6 +688,7 @@ WINE_CONFIG_HELPERS wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" +loader_install="" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` case $host_os in @@ -1981,10 +1982,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte esac ;; esac -AS_VAR_APPEND([LOADER_RULES],[" -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs -"]) dnl **** Check for functions **** @@ -3694,16 +3691,21 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else + loader_install="$loader_install wine.inf" AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: wine.inf - \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf +install install-lib:: \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls "]) fi +AS_VAR_APPEND([LOADER_RULES],[" +PROGRAMS = $loader_programs +INSTALL_LIB = $loader_programs$loader_install +"]) + if test "$srcdir" = . then AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore], diff --git a/tools/makedep.c b/tools/makedep.c index 75c7d91..469b833 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2254,6 +2254,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "%s:", obj_dir_path( make, obj )); output_filenames( dependencies ); output( "\n" ); + add_install_rule( make, install_rules, obj, xstrdup( obj ), + strmake( "d$(datadir)/wine/%s", obj )); } else if (!strcmp( ext, "sfd" )) /* font file */ {

1 0

Alexandre Julliard : makefiles: Install source directory files from the top-level makefile.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 9b71b3669e3065eefe7a6e1c4559fe44ad728415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b71b3669e3065eefe7a6e1c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 16:07:49 2015 +0900 makefiles: Install source directory files from the top-level makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 ++++++++++--------------- configure.ac | 27 ++++++++++++--------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 0aa17fc..8b0b2c9 100755 --- a/configure +++ b/configure @@ -8763,15 +8763,6 @@ libwine_DEPS = wine.map ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) " - if test -z "$with_wine64" - then - as_fn_append LOADER_RULES " -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop -" - fi ;; esac @@ -18319,13 +18310,17 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else loader_install="$loader_install wine.inf" - as_fn_append LOADER_RULES " -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls - + wine_fn_append_rule "install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -" + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls" + case $host_os in + cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; + *) wine_fn_append_rule "install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;; + esac fi as_fn_append LOADER_RULES " diff --git a/configure.ac b/configure.ac index 685b346..f86fd2b 100644 --- a/configure.ac +++ b/configure.ac @@ -962,15 +962,6 @@ libwine_DEPS = wine.map ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) "]) - if test -z "$with_wine64" - then - AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop -"]) - fi ;; esac @@ -3692,13 +3683,19 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else loader_install="$loader_install wine.inf" - AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls - + WINE_APPEND_RULE( +[install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -"]) + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) + case $host_os in + cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; + *) WINE_APPEND_RULE( +[install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;; + esac fi AS_VAR_APPEND([LOADER_RULES],["

1 0

Alexandre Julliard : makefiles: Replace the loader makefile rules by variable declarations.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 3cac38ab29ed3fa1dfe65ffb544124743de1ae9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cac38ab29ed3fa1dfe65ffb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 17:05:46 2015 +0900 makefiles: Replace the loader makefile rules by variable declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 4 ++++ configure | 47 ++++++++++++++--------------------------------- configure.ac | 39 +++++++-------------------------------- loader/Makefile.in | 22 +++++++++++++++++----- 4 files changed, 42 insertions(+), 70 deletions(-) diff --git a/Makefile.in b/Makefile.in index 78a8c8c..9308b69 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,6 +48,7 @@ EXTRACFLAGS = @EXTRACFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ UNWINDFLAGS = @UNWINDFLAGS@ +LDEXECFLAGS = @LDEXECFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ @@ -88,6 +89,9 @@ INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) prog_manext = 1 api_manext = 3w conf_manext = 5 +WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ +WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ +WINELOADER_INSTALL = @WINELOADER_INSTALL@ @ALL_VARS_RULES@ @SET_MAKE@ diff --git a/configure b/configure index 8b0b2c9..875a145 100755 --- a/configure +++ b/configure @@ -624,6 +624,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +WINELOADER_INSTALL LINGUAS ALL_VARS_RULES LDAP_LIBS @@ -689,6 +690,7 @@ PTHREAD_LIBS CROSSCC CROSSTARGET PRELINK +WINELOADER_DEPENDS CARBON_LIBS QUICKTIME_LIBS OPENCL_LIBS @@ -705,11 +707,12 @@ COREFOUNDATION_LIBS LIBWINE_RULES SOCKET_LIBS DLLTOOL +WINELOADER_PROGRAMS ALL_TEST_RESOURCES READELF OTOOL LDD -LOADER_RULES +LDEXECFLAGS LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS @@ -7142,7 +7145,7 @@ LDRPATH_INSTALL="" LDRPATH_LOCAL="" -LOADER_RULES="" +LDEXECFLAGS="" LIBEXT="so" DLLEXT=".so" @@ -7864,8 +7867,8 @@ distclean:: wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" -loader_programs="$wine_binary" -loader_install="" +WINELOADER_PROGRAMS="$wine_binary" + libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` case $host_os in @@ -8236,16 +8239,12 @@ libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dy " - as_fn_append LOADER_RULES " -${wine_binary}_OBJS = main.o -${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -${wine_binary}_DEPS = wine_info.plist -" + WINELOADER_DEPENDS="wine_info.plist" + ;; linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" - LDEXECFLAGS="" dlldir="\${libdir}" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } @@ -8392,11 +8391,6 @@ INSTALL_LIB = libwine.so libwine_LDFLAGS = -shared " - - as_fn_append LOADER_RULES " -${wine_binary}_OBJS = main.o -${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -" ;; *) @@ -8758,11 +8752,6 @@ libwine_LDFLAGS = $shared_ldflags libwine_DEPS = wine.map " - - as_fn_append LOADER_RULES " -${wine_binary}_OBJS = main.o -${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -" ;; esac @@ -14962,12 +14951,8 @@ case $host_os in case $host_cpu in *i[3456789]86*|x86_64*) test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine-preloader" - loader_programs="$loader_programs $wine_binary-preloader" - as_fn_append LOADER_RULES " -preloader_EXTRADEFS = $BUILTINFLAG -${wine_binary}_preloader_OBJS = preloader.o -${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -" ;; + WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + ;; esac ;; esac @@ -18066,7 +18051,7 @@ wine_fn_config_makefile include enable_include clean,install-dev wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,config,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader clean,config,install-lib +wine_fn_config_makefile loader enable_loader clean,install-lib wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install,po @@ -18309,7 +18294,8 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else - loader_install="$loader_install wine.inf" + WINELOADER_INSTALL="wine.inf" + wine_fn_append_rule "install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: @@ -18323,11 +18309,6 @@ uninstall:: esac fi -as_fn_append LOADER_RULES " -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs$loader_install -" - if test "$srcdir" = . then ac_config_commands="$ac_config_commands .gitignore" diff --git a/configure.ac b/configure.ac index f86fd2b..4de657c 100644 --- a/configure.ac +++ b/configure.ac @@ -677,7 +677,7 @@ AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") -AC_SUBST(LOADER_RULES,"") +AC_SUBST(LDEXECFLAGS,"") LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -687,8 +687,7 @@ WINE_CONFIG_HELPERS wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" -loader_programs="$wine_binary" -loader_install="" +AC_SUBST(WINELOADER_PROGRAMS,"$wine_binary") libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` case $host_os in @@ -850,16 +849,11 @@ INSTALL_DEV = libwine.dylib libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version "]) - AS_VAR_APPEND([LOADER_RULES],[" -${wine_binary}_OBJS = main.o -${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -${wine_binary}_DEPS = wine_info.plist -"]) + AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") ;; linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" - LDEXECFLAGS="" dlldir="\${libdir}" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [LDEXECFLAGS="-Wl,--export-dynamic"]) @@ -885,11 +879,6 @@ SHAREDLIB = libwine.so INSTALL_LIB = libwine.so libwine_LDFLAGS = -shared "]) - - AS_VAR_APPEND([LOADER_RULES],[" -${wine_binary}_OBJS = main.o -${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -"]) ;; *) @@ -957,11 +946,6 @@ INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags libwine_DEPS = wine.map "]) - - AS_VAR_APPEND([LOADER_RULES],[" -${wine_binary}_OBJS = main.o -${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -"]) ;; esac @@ -1964,12 +1948,8 @@ case $host_os in case $host_cpu in *i[[3456789]]86*|x86_64*) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") - loader_programs="$loader_programs $wine_binary-preloader" - AS_VAR_APPEND([LOADER_RULES],[" -preloader_EXTRADEFS = $BUILTINFLAG -${wine_binary}_preloader_OBJS = preloader.o -${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -"]) ;; + WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + ;; esac ;; esac @@ -3421,7 +3401,7 @@ WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,config,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib]) +WINE_CONFIG_MAKEFILE([loader],,[clean,install-lib]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install,po]) @@ -3682,7 +3662,7 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else - loader_install="$loader_install wine.inf" + AC_SUBST(WINELOADER_INSTALL,"wine.inf") WINE_APPEND_RULE( [install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls @@ -3698,11 +3678,6 @@ uninstall:: esac fi -AS_VAR_APPEND([LOADER_RULES],[" -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs$loader_install -"]) - if test "$srcdir" = . then AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore], diff --git a/loader/Makefile.in b/loader/Makefile.in index 7719801..8190037 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -12,9 +12,21 @@ IN_SRCS = \ wine.inf.in \ wine_info.plist.in -(a)LOADER_RULES@ +PROGRAMS = $(WINELOADER_PROGRAMS) +INSTALL_LIB = $(WINELOADER_PROGRAMS) $(WINELOADER_INSTALL) -# Make sure that make_makefiles sees the generated rules -.PHONY: install install-lib uninstall -install install-lib:: -clean:: +preloader_EXTRADEFS = $(MSVCRTFLAGS) + +wine_OBJS = main.o +wine_DEPS = $(WINELOADER_DEPENDS) +wine_LDFLAGS = $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) + +wine64_OBJS = main.o +wine64_DEPS = $(WINELOADER_DEPENDS) +wine64_LDFLAGS = $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) + +wine_preloader_OBJS = preloader.o +wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 + +wine64_preloader_OBJS = preloader.o +wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000

1 0

Alexandre Julliard : makefiles: Replace the libwine makefile rules by variable declarations.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: dec6a946d305aa2f6236e2f3be0bb93540383617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec6a946d305aa2f6236e2f3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 18:38:51 2015 +0900 makefiles: Replace the libwine makefile rules by variable declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 7 +++++ configure | 75 ++++++++++++++++++++++++++++----------------------- configure.ac | 57 ++++++++++++++++----------------------- libs/wine/Makefile.in | 19 ++++++------- tools/make_makefiles | 12 ++++----- 5 files changed, 87 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dec6a946d305aa2f6236e…

1 0

Alexandre Julliard : makefiles: Expand the test resource list through a makefile variable.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: fc5739411d92e09c6a53bf820ba5d3c7b71e11b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5739411d92e09c6a53bf820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 18:56:20 2015 +0900 makefiles: Expand the test resource list through a makefile variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 2 +- configure.ac | 2 +- programs/winetest/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4760fec..1c5a44d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,6 +99,7 @@ LIBWINE_INSTALL_LIB = @LIBWINE_INSTALL_LIB@ LIBWINE_INSTALL_DEV = @LIBWINE_INSTALL_DEV@ LIBWINE_LDFLAGS = @LIBWINE_LDFLAGS@ LIBWINE_DEPENDS = @LIBWINE_DEPENDS@ +ALL_TEST_RESOURCES = @ALL_TEST_RESOURCES@ @ALL_VARS_RULES@ @SET_MAKE@ diff --git a/configure b/configure index 69654d1..3903e4f 100755 --- a/configure +++ b/configure @@ -18136,7 +18136,7 @@ wine_fn_config_program winemenubuilder enable_winemenubuilder install wine_fn_config_program winemine enable_winemine install,installbin,manpage,po wine_fn_config_program winemsibuilder enable_winemsibuilder install wine_fn_config_program winepath enable_winepath install,installbin,manpage -wine_fn_config_program winetest enable_winetest clean,config +wine_fn_config_program winetest enable_winetest clean wine_fn_config_program winevdm enable_win16 install wine_fn_config_program winhelp.exe16 enable_win16 install wine_fn_config_program winhlp32 enable_winhlp32 install,po diff --git a/configure.ac b/configure.ac index b748f1b..7d2449f 100644 --- a/configure.ac +++ b/configure.ac @@ -3468,7 +3468,7 @@ WINE_CONFIG_PROGRAM(winemenubuilder,,[install]) WINE_CONFIG_PROGRAM(winemine,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(winemsibuilder,,[install]) WINE_CONFIG_PROGRAM(winepath,,[install,installbin,manpage]) -WINE_CONFIG_PROGRAM(winetest,,[clean,config]) +WINE_CONFIG_PROGRAM(winetest,,[clean]) WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install]) WINE_CONFIG_PROGRAM(winhelp.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(winhlp32,,[install,po]) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 4070016..64f5172 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -14,7 +14,7 @@ RC_SRCS = \ SVG_SRCS = winetest.svg -EXTRA_OBJS = build.res @ALL_TEST_RESOURCES@ +EXTRA_OBJS = build.res $(ALL_TEST_RESOURCES) EXTRA_TARGETS = build.rc build.nfo

1 0

Alexandre Julliard : makefiles: Remove support for running subdirectory makefiles through config.status.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: ca2cb6011cdd78e2d17659dc65837abbaccf08cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2cb6011cdd78e2d17659dc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 18:56:41 2015 +0900 makefiles: Remove support for running subdirectory makefiles through config.status. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 13 +------------ configure | 13 +------------ tools/make_makefiles | 2 +- tools/makedep.c | 17 ++++------------- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8e047b5..d5a3532 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -225,24 +225,13 @@ wine_fn_has_flag () wine_fn_depend_rules () { - if wine_fn_has_flag config - then - wine_fn_append_rule \ -"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir -depend: $ac_dir/depend -.PHONY: $ac_dir/depend -$ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir" - else - wine_fn_append_rule \ + wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile \$(MAKEDEP) \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy \$(MAKEDEP) $ac_dir" - fi } wine_fn_pot_rules () diff --git a/configure b/configure index 3903e4f..3d6d521 100755 --- a/configure +++ b/configure @@ -7415,24 +7415,13 @@ wine_fn_has_flag () wine_fn_depend_rules () { - if wine_fn_has_flag config - then - wine_fn_append_rule \ -"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir -depend: $ac_dir/depend -.PHONY: $ac_dir/depend -$ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir" - else - wine_fn_append_rule \ + wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile \$(MAKEDEP) \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy \$(MAKEDEP) $ac_dir" - fi } wine_fn_pot_rules () diff --git a/tools/make_makefiles b/tools/make_makefiles index e86c95b..78b6dea 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -202,7 +202,7 @@ sub parse_makefile($) if (/\@[A-Z_]+\@/) # config.status substitution variable { - ${$make{"=flags"}}{"config"} = 1; + die "Configure substitution is not allowed in $file"; } if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) { diff --git a/tools/makedep.c b/tools/makedep.c index 469b833..14a26ef 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -180,7 +180,6 @@ struct makefile static struct makefile *top_makefile; static const char *output_makefile_name = "Makefile"; -static const char *input_makefile_name; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; @@ -193,8 +192,7 @@ static const char Usage[] = "Usage: makedep [options] directories\n" "Options:\n" " -R from to Compute the relative path between two directories\n" - " -fxxx Store output in file 'xxx' (default: Makefile)\n" - " -ixxx Read input from file 'xxx' (default: Makefile.in)\n"; + " -fxxx Store output in file 'xxx' (default: Makefile)\n"; #ifndef __GNUC__ @@ -1558,11 +1556,9 @@ static FILE *open_input_makefile( const struct makefile *make ) FILE *ret; if (make->base_dir) - { - input_file_name = base_dir_path( make, input_makefile_name ); - if (strendswith( input_makefile_name, ".in" )) input_file_name = root_dir_path( input_file_name ); - } - else input_file_name = output_makefile_name; /* always use output name for main Makefile */ + input_file_name = root_dir_path( base_dir_path( make, strmake( "%s.in", output_makefile_name ))); + else + input_file_name = output_makefile_name; /* always use output name for main Makefile */ input_line = 0; if (!(ret = fopen( input_file_name, "r" ))) fatal_perror( "open" ); @@ -3208,9 +3204,6 @@ static int parse_option( const char *opt ) case 'f': if (opt[2]) output_makefile_name = opt + 2; break; - case 'i': - if (opt[2]) input_makefile_name = opt + 2; - break; case 'R': relative_dir_mode = 1; break; @@ -3271,8 +3264,6 @@ int main( int argc, char *argv[] ) for (i = 0; i < HASH_SIZE; i++) list_init( &files[i] ); - if (!input_makefile_name) input_makefile_name = strmake( "%s.in", output_makefile_name ); - top_makefile = parse_makefile( NULL, "# End of common header" ); linguas = get_expanded_make_var_array( top_makefile, "LINGUAS" );

1 0

Austin English : wine.inf: Add Windows Media Player version registry keys.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 76faeeb50f66cb5ba211b7ea4cc00df5a129284d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76faeeb50f66cb5ba211b7ea4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 12 17:21:32 2015 -0600 wine.inf: Add Windows Media Player version registry keys. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fea8da4..e091727 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -635,6 +635,7 @@ HKLM,Software\Microsoft\DFS,,16 HKLM,Software\Microsoft\Driver Signing,,16 HKLM,Software\Microsoft\EnterpriseCertificates,,16 HKLM,Software\Microsoft\EventSystem,,16 +HKLM,Software\Microsoft\MediaPlayer\PlayerUpgrade,"PlayerVersion",2,"12,0,7601,18840" HKLM,Software\Microsoft\MSMQ,,16 HKLM,Software\Microsoft\Non-Driver Signing,,16 HKLM,Software\Microsoft\Notepad\DefaultFonts,,16 @@ -676,6 +677,12 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},,2,"Windows Media Player" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"ComponentID",2,"wmp" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840" + [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,""

1 0

Alistair Leslie-Hughes : odbccp32: Remove duplicate string.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d77423093cad30de0363a993a36c965e3099b23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77423093cad30de0363a993a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 13 17:49:49 2015 +1100 odbccp32: Remove duplicate string. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 7aac6dd..bc643d4 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc); /* Registry key names */ static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; +static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; /* This config mode is known to be process-wide. * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. @@ -401,7 +402,6 @@ BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax, static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename) { - static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\',0}; HKEY hkey, hkeyfilename, hkeysection; LONG ret; @@ -1165,7 +1165,6 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry { LONG ret; HKEY hkey; - WCHAR softwareodbc[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; clear_errors(); TRACE("%s %s %s %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), @@ -1177,7 +1176,7 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry return FALSE; } - if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, softwareodbc, &hkey)) == ERROR_SUCCESS) + if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, odbcW, &hkey)) == ERROR_SUCCESS) { HKEY hkeyfilename;

1 0