makefiles: Generate a single non-recursive makefile at the top level.

Makefile.in

@@ -115,16 +115,20 @@ install-manpages:: manpages
 
 .PHONY: install-manpages
 
-# Dependencies between directories
+# Rules for generated source files
 
-# dependencies needed to build any dll or program
-__tooldeps__: libs/wpp
-__builddeps__: __tooldeps__ libs/wine include po
-.PHONY: depend dummy install install-lib install-dev
+dlls/ntdll/unix/version.c: dummy
+	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
 
-dummy:
-server: include
-libs/port libs/wine libs/wpp: include/config.h
+programs/winetest/build.rc: dummy
+	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
+
+programs/winetest/build.nfo:
+	-$(CC) -v 2>$@
+
+dlls/wineandroid.drv/wine-debug.apk: dlls/wineandroid.drv/build.gradle $(srcdir)/dlls/wineandroid.drv/AndroidManifest.xml $(srcdir)/dlls/wineandroid.drv/WineActivity.java $(srcdir)/dlls/wineandroid.drv/wine.svg
+	cd dlls/wineandroid.drv && gradle -q -Psrcdir=$(srcdir) assembleDebug
+	mv dlls/wineandroid.drv/build/outputs/apk/wine-debug.apk $@
 
 # Misc rules
 

configure

@@ -8725,10 +8725,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration"
 
 
-    WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
+    WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
 
     wine_can_build_preloader=yes
-    WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
+    WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5
 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; }
 if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then :
@@ -20127,8 +20127,10 @@ wine_fn_append_rule "
 all: Makefile
 Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP)
 	@./config.status Make.tmp Makefile
-depend: \$(MAKEDEP) dummy
-	\$(MAKEDEP)"
+depend: \$(MAKEDEP)
+	\$(MAKEDEP)
+dummy:
+.PHONY: depend dummy"
 
 ac_config_links="$ac_config_links wine:tools/winewrapper"
 wine_fn_config_symlink wine
@@ -21431,9 +21433,7 @@ if test "x$enable_tools" != xno
 then
     wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status
 	@./config.status tools/makedep
-Makefile: tools/makedep$ac_exeext
-fonts: tools/sfnt2fon
-include: tools tools/widl"
+Makefile: tools/makedep$ac_exeext"
 else
     wine_fn_append_rule "\$(MAKEDEP):
 	@echo \"You need to run make in $TOOLSDIR first\" && false"

configure.ac

@@ -756,10 +756,10 @@ case $host_os in
     AC_SUBST(APPKIT_LIBS,"-framework AppKit")
     AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration")
 
-    WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
+    WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
 
     wine_can_build_preloader=yes
-    WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
+    WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
     WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main],
                     [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS"
                      WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],,
@@ -2805,8 +2805,10 @@ WINE_APPEND_RULE([
 all: Makefile
 Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP)
 	@./config.status Make.tmp Makefile
-depend: \$(MAKEDEP) dummy
-	\$(MAKEDEP)])
+depend: \$(MAKEDEP)
+	\$(MAKEDEP)
+dummy:
+.PHONY: depend dummy])
 
 WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
 WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"])
@@ -4119,9 +4121,7 @@ then
     WINE_APPEND_RULE(
 [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status
 	@./config.status tools/makedep
-Makefile: tools/makedep$ac_exeext
-fonts: tools/sfnt2fon
-include: tools tools/widl])
+Makefile: tools/makedep$ac_exeext])
 else
     WINE_APPEND_RULE(
 [\$(MAKEDEP):

dlls/ntdll/Makefile.in

@@ -79,9 +79,3 @@ unix_loader_EXTRADEFS = \
 	-DBINDIR=\"${bindir}\" \
 	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
 	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
-
-unix/version.c: dummy
-	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
-
-dummy:
-.PHONY: dummy

dlls/wineandroid.drv/Makefile.in

@@ -16,7 +16,3 @@ SVG_SRCS = \
 	wine.svg
 
 EXTRA_TARGETS = wine-debug.apk
-
-wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg
-	gradle -q -Psrcdir=$(srcdir) assembleDebug
-	mv build/outputs/apk/wine-debug.apk $@

dlls/wineandroid.drv/build.gradle.in

@@ -32,6 +32,12 @@ buildscript
     }
 }
 
+def get_srcdir()
+{
+    if (srcdir.equals(".")) { return "."; }
+    return (srcdir.charAt(0) == "/" ? srcdir : "../../" + srcdir) + "/dlls/wineandroid.drv";
+}
+
 def add_icon_task( dir, scale )
 {
     return tasks.create( "createIcon-" + dir, Exec ) {
@@ -39,7 +45,7 @@ def add_icon_task( dir, scale )
         outputs.dir( outdir )
         doFirst { outdir.mkdirs() }
         def png = new File( outdir, "wine.png" )
-        def svg = new File( srcdir, "wine.svg" )
+        def svg = new File( get_srcdir(), "wine.svg" )
         inputs.file( svg )
         outputs.file( png )
         commandLine "rsvg-convert", "-z", scale, "-o", png, svg
@@ -97,10 +103,10 @@ android
     sourceSets
     {
         main.assets.srcDirs = [ "assets" ]
-        main.java.srcDirs = [ srcdir ]
+        main.java.srcDirs = [ get_srcdir() ]
         main.jniLibs.srcDirs = [ "lib" ]
         main.java.excludes = [ "build" ]
         main.res.srcDirs = [ "res" ]
-        main.manifest.srcFile srcdir + "/AndroidManifest.xml"
+        main.manifest.srcFile get_srcdir() + "/AndroidManifest.xml"
     }
 }

programs/winetest/Makefile.in

@@ -20,12 +20,3 @@ EXTRA_OBJS = build.res
 EXTRA_TARGETS = build.nfo
 
 INSTALL_LIB = none
-
-build.rc: dummy
-	build="STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
-
-build.nfo:
-	-$(CC) -v 2>$@
-
-dummy:
-.PHONY: dummy