From 3cac38ab29ed3fa1dfe65ffb544124743de1ae9e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 13 Nov 2015 17:05:46 +0900
Subject: [PATCH] makefiles: Replace the loader makefile rules by variable
 declarations.

Signed-off-by: Alexandre Julliard <julliard@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 78a8c8cd29d..9308b6910c3 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 8b0b2c9af36..875a145350c 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 f86fd2b1142..4de657cbc1f 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"])
@@ -884,11 +878,6 @@ ${wine_binary}_DEPS = wine_info.plist
 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)
 "])
     ;;
 
@@ -956,11 +945,6 @@ INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion
 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 7719801d499..819003773b0 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -12,9 +12,21 @@ IN_SRCS = \
 	wine.inf.in \
 	wine_info.plist.in
 
-@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