[mupen64plus-ui-console] 147/172: Don't fail rebuild when header is removed

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit f7e8b72b52a8426fe57ef785672a5b0846158f46
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Sep 10 22:29:05 2013 +0200

    Don't fail rebuild when header is removed
    
    The *.d depends files for make just list the files used when building an object
    file. Removing a file listed in such a dependency file causes make to search
    for a way to recreate it. This usually cannot work because these files aren't
    autogenerated.
    
    The gcc option -MP can be used to generate empty rule for these files. Removing
    a file in a dependency list will then execute this empty rule and continue with
    the execution of the creation of the object file. This compilation process will
    then automatically correct the dependency file.
---
 debian/changelog                         |  7 +++++++
 debian/patches/make_header_depends.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f6252b1..a84f35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-ui-console (2.0-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add make_header_depends.patch, Don't fail rebuild when header is removed
+
+ -- Sven Eckelmann <sven at narfation.org>  Tue, 10 Sep 2013 22:28:37 +0200
+
 mupen64plus-ui-console (2.0-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/patches/make_header_depends.patch b/debian/patches/make_header_depends.patch
new file mode 100644
index 0000000..4e1f510
--- /dev/null
+++ b/debian/patches/make_header_depends.patch
@@ -0,0 +1,26 @@
+Description: Don't fail rebuild when header is removed
+ The *.d depends files for make just list the files used when building an
+ object file. Removing a file listed in such a dependency file causes make to
+ search for a way to recreate it. This usually cannot work because these files
+ aren't autogenerated.
+ .
+ The gcc option -MP can be used to generate empty rule for these files.
+ Removing a file in a dependency list will then execute this empty rule and
+ continue with the execution of the creation of the object file. This
+ compilation process will then automatically correct the dependency file.
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index 848a3aeb051ec103d355d7468ae349daaefbd5c6..d2082a58a74d9bcd13a7846232a2736eab6f75c2 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -312,7 +312,7 @@ uninstall:
+ 	$(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/man6/mupen64plus.6"
+ 
+ # build dependency files
+-CFLAGS += -MD
++CFLAGS += -MD -MP
+ -include $(OBJECTS:.o=.d)
+ 
+ # standard build rules
diff --git a/debian/patches/series b/debian/patches/series
index 5a5a78d..8fd2873 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 printf_fixup.patch
+make_header_depends.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git