From 0b8b30c19945987afb66ea6b5aa23419225d8d06 Mon Sep 17 00:00:00 2001 From: kiwi Date: Sat, 23 Sep 2006 12:09:57 +0000 Subject: [PATCH] patches from Lutin to pass distcheck SVN revision: 26066 --- Makefile.am | 1 + data/images/Makefile.am | 1 + data/theme/Makefile.am | 10 ++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1a3bc2b..0764cc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,5 +4,6 @@ SUBDIRS = src data filesdir = $(datadir) files_DATA = module.edj module.desktop +EXTRA_DIST= $(files_DATA) pkgdir = $(datadir)/$(MODULE_ARCH) \ No newline at end of file diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 221b5c8..0a682c8 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -2,3 +2,4 @@ MAINTAINERCLEANFILES = Makefile.in filesdir = $(datadir)/images files_DATA = photo_logo.png +EXTRA_DIST = $(files_DATA) \ No newline at end of file diff --git a/data/theme/Makefile.am b/data/theme/Makefile.am index fb49d74..79e2c96 100644 --- a/data/theme/Makefile.am +++ b/data/theme/Makefile.am @@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ EDJE_FLAGS = -v \ - -id images \ - -fd fonts + -id $(top_srcdir)/data/theme/images \ + -fd $(top_srcdir)/data/theme/fonts EXTRA_DIST = \ photo.edc \ @@ -16,7 +16,9 @@ photo_popi_programs.edc \ photo_popw.edc \ photo_popw_parts.edc \ photo_popw_programs.edc \ -photo_icon.edc +photo_icon.edc \ +$(wildcard fonts/*.ttf) \ +$(wildcard images/*.png) filesdir = $(datadir) files_DATA = photo.edj @@ -26,5 +28,5 @@ photo.edj: Makefile $(EXTRA_DIST) $(top_srcdir)/data/theme/photo.edc \ $(top_builddir)/data/theme/photo.edj -clean: +clean-local: rm -f photo.edj