commit 662ad7e5fb8e6168e4ea465792bfc93c2af39d53 Author: Frédéric Péters Date: Sat Jun 19 12:30:12 2010 +0200 [build] move to recursive automake for data/ diff --git a/Makefile.am b/Makefile.am index 0b14140..6d78a44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,33 +82,19 @@ VALAFLAGS = --pkg glib-2.0 \ -g \ $(NULL) -SUBDIRS = po +SUBDIRS = data po ease_LDADD = \ $(EASE_LIBS) \ $(NULL) -EXTRA_DIST = data/ease.desktop.in \ - $(NULL) - DISTCLEANFILES = \ $(NULL) ACLOCAL_AMFLAGS = -I m4 -desktopdir = $(datadir)/applications -desktop_in_files = data/ease.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@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) +