[ease] Fix distcheck!



commit b7ccf01872af3c244555e9b3d253d9f891ef1b8d
Author: Frédéric Péters <fpeters 0d be>
Date:   Mon Jun 21 14:10:50 2010 +0200

    Fix distcheck!
    
    Thanks to the help of Frederic Peters and Christophe Fergeau, Ease
     passes distcheck. Long-term goal : switching back to non-recursive
    Makefile.

 Makefile.am      |   18 +++---------------
 configure.ac     |    2 +-
 data/Makefile.am |   11 +++++++++++
 po/POTFILES.in   |    2 --
 4 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0519b79..69d7d78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,7 @@ VALAFLAGS = --pkg glib-2.0 \
 		-g \
 		$(NULL)
 
-SUBDIRS = po
+SUBDIRS = po data
 
 ease_LDADD = \
 	$(EASE_LIBS) \
@@ -91,25 +91,13 @@ ease_LDADD = \
 EXTRA_DIST = data/ease.desktop.in  \
 	$(NULL)
 
-DISTCLEANFILES = \
+DISTCLEANFILES = data/ease.desktop \
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
 
-desktopdir = $(datadir)/applications
-desktop_IN = data/ease.desktop.in
-desktop_DATA = \
-	$(desktop_IN:.in=)
- INTLTOOL_DESKTOP_RULE@
-
-Applicationsdir = /usr/share/applications
-Applications_DATA = data/ease.desktop.in
-
 themedir = $(datadir)/ease/themes
-theme_DATA = themes/*.easetheme
-
-svgdir = $(datadir)/ease/svg
-svg_DATA = data/svg/*.svg
+theme_DATA = $(wildcard $(top_srcdir)/themes/*.easetheme)
 
 doc: src/*.vala
 	rm -rf doc
diff --git a/configure.ac b/configure.ac
index e58ebb3..5a2aeb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([Ease], [0.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=ease],
 
 AC_PREREQ([2.59])
 
-AC_CONFIG_FILES([Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile po/Makefile.in data/Makefile])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..9793c2e
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,11 @@
+ INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = ease.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+svgdir = $(datadir)/ease/svg
+svg_DATA = $(wildcard $(top_srcdir)/data/svg/*.svg)
+
+EXTRA_DIST = $(svg_DATA) $(desktop_in_files)
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e82c8f8..d1f2d4b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,8 +24,6 @@ src/ease-media-element.vala
 src/ease-open-dialog.vala
 src/ease-pdf-exporter.vala
 src/ease-player.vala
-src/ease-plugin-import-dialog.vala
-src/ease-plugin-import-image.vala
 src/ease-scrollable-embed.vala
 src/ease-slide-actor.vala
 src/ease-slide-button-panel.vala



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]