From: Dan Nicholson <nicholson@endlessm.com>
Date: Mon, 16 Oct 2017 16:24:16 +0000 (+0000)
Subject: build: Fix bsdiff Makefile circular dependency
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~30^2~53
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9b3e01be301fbad2d1b9611c4eaa83f675f0c04b;p=ostree.git

build: Fix bsdiff Makefile circular dependency

The intended use was to have the .am.inc generated from the .am like the
libglnx one. Without this, make was detecting a circular dependency and
dropping the rule:

  make: Circular bsdiff/Makefile-bsdiff.am.inc <- bsdiff/Makefile-bsdiff.am.inc dependency dropped.

Closes: #1276
Approved by: jlebon
---

diff --git a/Makefile.am b/Makefile.am
index 48d0830f..7f913ab5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,7 @@ libbsdiff_srcpath := $(srcdir)/bsdiff
 libbsdiff_cflags := $(OT_DEP_GIO_UNIX_CFLAGS) "-I$(bsdiff_srcpath)"
 libbsdiff_libs := $(OT_DEP_GIO_UNIX_LIBS)
 # See the comment for the similar libglnx bit above
-$(srcdir)/bsdiff/Makefile-bsdiff.am.inc: $(srcdir)/bsdiff/Makefile-bsdiff.am.inc
+$(srcdir)/bsdiff/Makefile-bsdiff.am.inc: $(srcdir)/bsdiff/Makefile-bsdiff.am
 	sed -e 's,$(libbsdiff_srcpath),bsdiff,g' < $< > $@
 include bsdiff/Makefile-bsdiff.am.inc
 EXTRA_DIST += bsdiff/Makefile-bsdiff.am