tcbrindle / gsound Goto Github PK

From a7753944f7a4f6c817a4e421cdb8d6d7975b4409 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <[email protected]>
Date: Wed, 26 Nov 2014 11:34:30 +0200
Subject: [PATCH] build: Don't explicitly dist files that automake handles by
 default

Also avoid reinventing docdir in the wrong place

---
 Makefile.am | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7c03386..7faf028 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,23 +15,8 @@ dist-hook:
                echo A git clone is required to generate a ChangeLog >&2; \
        fi
 
-gsounddocdir = ${prefix}/doc/gsound
-gsounddoc_DATA = \
-       README.md\
-       COPYING\
-       AUTHORS\
-       ChangeLog\
-       INSTALL\
-       NEWS
-
-
-EXTRA_DIST = $(gsounddoc_DATA)
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 
 
-# Remove doc directory on uninstall
-uninstall-local:
-       -rm -r $(gsounddocdir)
-
 -include $(top_srcdir)/git.mk
-- 
2.1.0

From b6aabbc00db2e2e508c1dc185684a48db91bc7f8 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <[email protected]>
Date: Wed, 26 Nov 2014 12:22:58 +0200
Subject: [PATCH] build: Fix builddir != srcdir -> distcheck

gsound.h is not a product of the build so use it from top_srcdir

---
 tools/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9b720f8..8736fad 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -13,7 +13,7 @@ gsound_play_VALAFLAGS = \
     ${NULL}
 
 gsound_play_CPPFLAGS = \
-    -I${top_builddir}/gsound \
+    -I${top_srcdir}/gsound \
     ${GSOUND_CFLAGS} \
     ${NULL}
 
-- 
2.1.0