summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Loeuillet <leroutier@gmail.com>2007-11-01 14:12:56 +0100
committerStephane Loeuillet <leroutier@gmail.com>2007-11-01 14:12:56 +0100
commit6814efa3edc8e206696fa4bf884c4d47224d7313 (patch)
treec6cdbd03056427d79ef571cb757809aa469a6aca
parent26a4d39043b6d7efc3ff5803bf5a5d9130a26248 (diff)
Makefile.am clean-up
-rw-r--r--data/Makefile.am8
-rw-r--r--thumbnailer/Makefile.am20
2 files changed, 12 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 59cdcf1..ffde790 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,11 @@
-EXTRA_DIST = \
- swfdec-player.desktop.in
-
desktop_in_files = swfdec-player.desktop.in
desktopdir = $(datadir)/applications
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+EXTRA_DIST = \
+ $(desktop_in_files)
+
CLEANFILES = \
- swfdec-player.deskto
+ $(desktop_DATA)
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 29fb1da..1c06f8b 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -1,5 +1,3 @@
-@INTLTOOL_SCHEMAS_RULE@
-
bin_PROGRAMS = swfdec-thumbnailer
swfdec_thumbnailer_SOURCES = swfdec-thumbnailer.c
@@ -7,13 +5,10 @@ swfdec_thumbnailer_SOURCES = swfdec-thumbnailer.c
INCLUDES = $(GLOBAL_CFLAGS) $(THUMBNAILER_CFLAGS)
swfdec_thumbnailer_LDFLAGS = $(THUMBNAILER_LIBS)
-schema_files = \
- swfdec-thumbnailer.schemas.in
-
-schema_DATA = \
- swfdec-thumbnailer.schemas
-
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = swfdec-thumbnailer.schemas.in
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@INTLTOOL_SCHEMAS_RULE@
install-data-local:
if GCONF_SCHEMAS_INSTALL
@@ -25,7 +20,8 @@ if GCONF_SCHEMAS_INSTALL
endif
EXTRA_DIST = \
- $(schema_files)
+ $(schemas_in_files)
+
+CLEANFILES = \
+ $(schemas_DATA)
-DISTCLEANFILES = \
- $(schema_DATA)