[recipes] Fix distcheck
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Fix distcheck
- Date: Sat, 7 Jan 2017 22:03:39 +0000 (UTC)
commit dd6003a0961f14224389b93aa65778f95f71673a
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jan 7 16:30:59 2017 -0500
Fix distcheck
src/Makefile.am | 16 ++++++++++------
tests/Makefile.am | 4 +++-
2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ef04dc4..06ad678 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
bin_PROGRAMS = recipes
commitid := $(shell $(GIT) describe)
-libgd_info = $(shell cat $(top_builddir)/libgd.info)
-libglnx_info = $(shell cat $(top_builddir)/libglnx.info)
+libgd_info = $(shell cat $(top_srcdir)/libgd.info)
+libglnx_info = $(shell cat $(top_srcdir)/libglnx.info)
recipes_CFLAGS = \
$(WARN_CFLAGS) \
@@ -16,7 +16,9 @@ recipes_CFLAGS = \
-DLIBGLNX_INFO=\"$(libglnx_info)\" \
-DMICRO_VERSION=$(MICRO_VERSION) \
-I "$(top_srcdir)/libgd" \
- -I "$(top_srcdir)/libglnx"
+ -I "$(top_srcdir)/libglnx" \
+ -I "$(top_srcdir)/src" \
+ -I "$(top_builddir)/src"
recipes_LDADD = $(RECIPES_LIBS) \
-lm \
@@ -128,14 +130,16 @@ BUILT_SOURCES = \
gr-shell-search-provider-dbus.h \
gr-shell-search-provider-dbus.c
+DISTCLEANFILES = \
+ ingredients.c \
+ no-ingredients.c \
+ segments.c
+
MAINTAINERCLEANFILES = \
resources-ui.c \
resources-images.c \
types.h \
types.c \
- ingredients.c \
- no-ingredients.c \
- segments.c \
gr-shell-search-provider-dbus.h \
gr-shell-search-provider-dbus.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b0ad50b..2ef1a48 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,9 @@ ingredients_SOURCES = ingredients-test.c
ingredients_CFLAGS = \
$(RECIPES_CFLAGS) \
-DPKGDATADIR=\"$(pkgdatadir)\" \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src
+
ingredients_LDADD = $(RECIPES_LIBS)
number_SOURCES = number.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]