Make sure to depend on source fetch actions

11 files changed, 29 insertions, 18 deletions

diff --git a/desktop/dmenu/gen.rc b/desktop/dmenu/gen.rc
index 3edcfa08..7500c452 100644
--- a/desktop/dmenu/gen.rc
+++ b/desktop/dmenu/gen.rc
@@ -8,7 +8,9 @@ cflags\
 	-isystem '$builddir'/desktop/wld/include\
 	-I '$dir'
 
-phony deps desktop/^(pixman swc wayland wld)^/headers
+phony deps\
+	'$builddir'/desktop/^(fontconfig libxkbcommon)^/fetch.stamp\
+	desktop/^(pixman swc wayland wld)^/headers
 
 exe dmenu -d '$dir'/deps dmenu.c drw.c util.c '$builddir'/^(\
 	desktop/swc/swc-protocol.c.o\
diff --git a/desktop/fontconfig/gen.rc b/desktop/fontconfig/gen.rc
index 6e31286c..7dbf56b4 100644
--- a/desktop/fontconfig/gen.rc
+++ b/desktop/fontconfig/gen.rc
@@ -7,7 +7,7 @@ cflags\
 	-I '$outdir' \
 	-I '$srcdir'
 
-deps=desktop/expat/headers
+deps=(desktop/expat/headers '$builddir'/desktop/freetype/fetch.stamp)
 
 rule makealias '$srcdir/src/makealias $srcdir/src $out $in'
 fn makealias {
diff --git a/desktop/libdrm/gen.rc b/desktop/libdrm/gen.rc
index 7ea2182b..90f8af65 100644
--- a/desktop/libdrm/gen.rc
+++ b/desktop/libdrm/gen.rc
@@ -1,6 +1,5 @@
 cflags\
 	-D HAVE_CONFIG_H\
-	-isystem desktop/libpciaccess/src/include\
 	-I include\
 	-I '$dir' \
 	-I '$srcdir' \
@@ -14,8 +13,8 @@ lib libdrm.a\
 	xf86drmMode.c
 
 if(~ intel $config_video_drivers) {
-	cflags -D 'HAVE_INTEL=1'
-	lib libdrm_intel.a intel/^(\
+	cflags -D 'HAVE_INTEL=1' -isystem desktop/libpciaccess/src/include
+	lib libdrm_intel.a -d '$builddir'/desktop/libpciaccess/fetch.stamp intel/^(\
 		intel_bufmgr.c\
 		intel_bufmgr_fake.c\
 		intel_bufmgr_gem.c\
diff --git a/desktop/st/gen.rc b/desktop/st/gen.rc
index 416acc33..843e5b72 100644
--- a/desktop/st/gen.rc
+++ b/desktop/st/gen.rc
@@ -8,7 +8,9 @@ cflags\
 	-isystem '$builddir'/desktop/wld/include\
 	-I '$dir'
 
-phony deps desktop/^(pixman wayland wayland-protocols wld)^/headers
+phony deps\
+	'$builddir'/desktop/^(fontconfig libxkbcommon)^/fetch.stamp\
+	desktop/^(pixman wayland wayland-protocols wld)^/headers
 
 exe st -d '$dir'/deps st.c '$builddir'/^(\
 	desktop/libxkbcommon/libxkbcommon.a\
diff --git a/desktop/swc/gen.rc b/desktop/swc/gen.rc
index 10298a72..fe3823b4 100644
--- a/desktop/swc/gen.rc
+++ b/desktop/swc/gen.rc
@@ -34,11 +34,14 @@ subninja '$dir'/tools.ninja
 rule convert_font '$outdir/convert_font $in $out.tmp 2>/dev/null && mv $out.tmp $out'
 build '$outdir'/cursor/cursor_data.h convert_font '$srcdir'/cursor/cursor.pcf '|' '$outdir'/convert_font
 
-phony deps '$outdir'/^(\
-	wayland-drm-server-protocol.h\
-	include/swc-server-protocol.h\
-	cursor/cursor_data.h\
-) desktop/^(pixman wayland wayland-protocols wld)^/headers
+phony deps\
+	'$outdir'/^(\
+		wayland-drm-server-protocol.h\
+		include/swc-server-protocol.h\
+		cursor/cursor_data.h\
+	)\
+	'$builddir'/desktop/^(fontconfig libdrm libevdev libxkbcommon)^/fetch.stamp\
+	desktop/^(pixman wayland wayland-protocols wld)^/headers
 
 lib libswc.a -d '$dir'/deps\
 	libswc/^(\
diff --git a/desktop/velox/gen.rc b/desktop/velox/gen.rc
index e74c7d45..f0217c44 100644
--- a/desktop/velox/gen.rc
+++ b/desktop/velox/gen.rc
@@ -12,9 +12,10 @@ waylandproto protocol/velox.xml\
 	protocol/velox-^(client server)^-protocol.h velox-protocol.c
 build '$outdir'/protocol/swc-client-protocol.h copy '$builddir'/desktop/swc/include/swc-client-protocol.h
 
-phony deps '$outdir'/^(\
-	protocol/^(swc-client velox-^(client server))^-protocol.h\
-) desktop/^(pixman swc wayland wld)^/headers\
+phony deps\
+	'$outdir'/protocol/^(swc-client velox-^(client server))^-protocol.h\
+	'$builddir'/desktop/^(fontconfig libxkbcommon swc)^/fetch.stamp\
+	desktop/^(pixman swc wayland wld)^/headers
 
 exe velox -d '$dir'/deps \
 	config.c\
diff --git a/desktop/wld/gen.rc b/desktop/wld/gen.rc
index 2137fdf7..85f6a180 100644
--- a/desktop/wld/gen.rc
+++ b/desktop/wld/gen.rc
@@ -60,6 +60,7 @@ waylandproto protocol/wayland-drm.xml\
 
 phony deps\
 	'$outdir'/protocol/wayland-drm-client-protocol.h\
+	'$builddir'/desktop/^(fontconfig freetype libdrm)^/fetch.stamp\
 	desktop/^(pixman wayland)^/headers 
 
 lib libwld.a -d '$dir'/deps $srcs '$builddir'/$libs
diff --git a/extra/msmtp/gen.rc b/extra/msmtp/gen.rc
index 66445501..c5f0aac3 100644
--- a/extra/msmtp/gen.rc
+++ b/extra/msmtp/gen.rc
@@ -5,7 +5,7 @@ cflags\
 	-I include\
 	-I '$dir' \
 
-exe msmtp src/^(\
+exe msmtp -d core/libressl/headers src/^(\
 	conf.c\
 	list.c\
 	msmtp.c\
diff --git a/extra/sshfs/gen.rc b/extra/sshfs/gen.rc
index cdb5abf6..07cc8249 100644
--- a/extra/sshfs/gen.rc
+++ b/extra/sshfs/gen.rc
@@ -7,7 +7,8 @@ cflags\
 build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in ; with\
 	expr 's,__UNMOUNT_COMMAND__,''fusermount -u'','
 
-exe sshfs sshfs.c nocache.c '$builddir'/extra/libfuse/libfuse.a
+exe sshfs -d '$builddir'/extra/libfuse/fetch.stamp\
+	sshfs.c nocache.c '$builddir'/extra/libfuse/libfuse.a
 file bin/sshfs '$outdir'/sshfs 755
 file share/man/man1/sshfs.1 '$outdir'/sshfs.1 644
 
diff --git a/extra/unzip/gen.rc b/extra/unzip/gen.rc
index 5423892c..5b5a537a 100644
--- a/extra/unzip/gen.rc
+++ b/extra/unzip/gen.rc
@@ -3,7 +3,7 @@ cflags\
 	-isystem core/bzip2/src\
 	-I '$srcdir'
 
-exe unzip\
+exe unzip -d '$builddir'/core/bzip2/fetch.stamp\
         unzip.c crc32.c crypt.c envargs.c explode.c\
 	extract.c fileio.c globals.c inflate.c list.c match.c\
 	process.c ttyio.c ubz2err.c unreduce.c unshrink.c zipinfo.c\
diff --git a/media/libass/gen.rc b/media/libass/gen.rc
index 4411b076..286c6f26 100644
--- a/media/libass/gen.rc
+++ b/media/libass/gen.rc
@@ -9,7 +9,9 @@ for(hdr in $hdrs)
 	build '$outdir'/include/ass/$hdr copy '$srcdir'/libass/$hdr
 phony headers '$outdir'/include/ass/$hdrs
 
-lib libass.a -d extra/fribidi/headers libass/^(\
+phony deps '$builddir'/desktop/freetype/fetch.stamp extra/fribidi/headers
+
+lib libass.a -d '$dir'/deps libass/^(\
 	ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c\
 	ass_utils.c ass_bitmap.c ass_blur.c ass_library.c\
 	ass_drawing.c\