From fc933a22f899fbd9ad56700949eb15b826b08997 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 17 Jun 2014 19:47:31 -0700
Subject: [PATCH] Stop using stamp files for multi-targets

It breaks dependency tracking
---
 Makefile.in             | 21 ++++++---------------
 submodules/rust-openssl |  2 +-
 submodules/rust-phf     |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 56da08fc..dd0d74de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,29 +9,22 @@ INSTALL_DIR := %PREFIX%
 ###############################################################################
 PHF_DIR := submodules/rust-phf
 PHF := $(foreach file,$(shell $(MAKE) -s -C $(PHF_DIR) print-targets),$(PHF_DIR)/$(file))
-PHF_STAMP := $(BUILDDIR)/phf.stamp
 OPENSSL_DIR := submodules/rust-openssl
 OPENSSL := $(foreach file,$(shell $(MAKE) -s -C $(OPENSSL_DIR) print-target),$(OPENSSL_DIR)/$(file))
-OPENSSL_STAMP := $(BUILDDIR)/openssl.stamp
 
-$(PHF): $(PHF_STAMP)
-
-$(PHF_STAMP): | $(BUILDDIR)
+.NOTPARALLEL: $(PHF)
+$(PHF): | $(BUILDDIR)
 	$(MAKE) -C $(PHF_DIR)
-	touch $(PHF_STAMP)
 
-$(OPENSSL): $(OPENSSL_STAMP)
-
-$(OPENSSL_STAMP): | $(BUILDDIR)
+.NOTPARALLEL: $(OPENSSL)
+$(OPENSSL): | $(BUILDDIR)
 	$(MAKE) -C $(OPENSSL_DIR)
-	touch $(OPENSSL_STAMP)
 
 ###############################################################################
 # Main targets
 ###############################################################################
 POSTGRES_LIB_FILE := src/lib.rs
 POSTGRES_LIB := $(foreach file,$(shell $(RUSTC) --crate-file-name $(POSTGRES_LIB_FILE)),$(BUILDDIR)/$(file))
-POSTGRES_STAMP := $(BUILDDIR)/postgres.stamp
 POSTGRES_TEST := $(BUILDDIR)/$(shell $(RUSTC) --test --crate-file-name $(POSTGRES_LIB_FILE))
 
 POSTGRES_LIB_DEPS := $(BUILDDIR)/postgres.d
@@ -45,12 +38,10 @@ LINK_ARGS := $(foreach file,$(OPENSSL),-L $(dir $(file))) $(foreach file,$(PHF),
 $(BUILDDIR):
 	mkdir -p $@
 
-$(POSTGRES_LIB): $(POSTGRES_STAMP)
-
-$(POSTGRES_STAMP): $(POSTGRES_LIB_FILE) $(PHF) $(OPENSSL) | $(BUILDDIR)
+.NOTPARALLEL: $(POSTGRES_LIB)
+$(POSTGRES_LIB): $(POSTGRES_LIB_FILE) $(PHF) $(OPENSSL) | $(BUILDDIR)
 	$(RUSTC) $(RUSTFLAGS) $(LINK_ARGS) --dep-info $(POSTGRES_LIB_DEPS) \
 		--out-dir $(@D) $<
-	touch $(POSTGRES_STAMP)
 
 $(POSTGRES_TEST): $(POSTGRES_LIB_FILE) $(PHF) $(OPENSSL) | $(BUILDDIR)
 	$(RUSTC) $(RUSTFLAGS) $(LINK_ARGS) --dep-info $(POSTGRES_TEST_DEPS) \
diff --git a/submodules/rust-openssl b/submodules/rust-openssl
index d766671b..7a294aff 160000
--- a/submodules/rust-openssl
+++ b/submodules/rust-openssl
@@ -1 +1 @@
-Subproject commit d766671bda3777690ef71739bbdd29382d56a7bc
+Subproject commit 7a294aff02d5caf0d62b7272b8a6a334f8c21fa9
diff --git a/submodules/rust-phf b/submodules/rust-phf
index f68b675a..6dcad9b5 160000
--- a/submodules/rust-phf
+++ b/submodules/rust-phf
@@ -1 +1 @@
-Subproject commit f68b675ab99b334fa8294476daf74729785b68db
+Subproject commit 6dcad9b5798d446ae81a4f433fa3cfdb766dcdae