summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Loeuillet <leroutier@gmail.com>2007-10-28 14:17:27 +0100
committerStéphane Loeuillet <leroutier@leroutier-desktop.(none)>2007-10-28 14:17:27 +0100
commit8fd96c54f62ece3ecd692f5975e2aaa1bfe77f3d (patch)
tree7a27734a886cf2d402bf106daaa1d98b5a309efd
parent6b7db76dca6e8c3024a24b239b4dab34ab332f08 (diff)
Move mime and desktop files to data/ directory
-rw-r--r--Makefile.am17
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am15
-rw-r--r--data/swfdec-player.desktop.in (renamed from swfdec-player.desktop.in)0
-rw-r--r--data/swfdec.xml (renamed from swfdec.xml)0
-rw-r--r--po/POTFILES.in2
6 files changed, 19 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 5dbe93f..6c5ddeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,10 @@
-SUBDIRS = player thumbnailer po
+SUBDIRS = player thumbnailer po data
EXTRA_DIST = \
autogen.sh \
intltool-extract.in \
intltool-merge.in \
- intltool-update.in \
- swfdec-player.desktop.in\
- swfdec.xml
-
-desktop_in_files = swfdec-player.desktop.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-mimedir = $(datadir)/mime/packages
-mime_DATA = swfdec.xml
-
-CLEANFILES = \
- swfdec-player.desktop
+ intltool-update.in
DISTCLEANFILES = \
intltool-extract \
diff --git a/configure.ac b/configure.ac
index 26181cb..0cb75f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,6 @@ dnl Finish up
AC_SUBST(GLOBAL_CFLAGS)
-AC_CONFIG_FILES(Makefile player/Makefile thumbnailer/Makefile po/Makefile.in)
+AC_CONFIG_FILES(Makefile player/Makefile thumbnailer/Makefile po/Makefile.in data/Makefile)
AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..b558e63
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,15 @@
+EXTRA_DIST = \
+ swfdec-player.desktop.in\
+ swfdec.xml
+
+desktop_in_files = swfdec-player.desktop.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+mimedir = $(datadir)/mime/packages
+mime_DATA = swfdec.xml
+
+CLEANFILES = \
+ swfdec-player.desktop
+
diff --git a/swfdec-player.desktop.in b/data/swfdec-player.desktop.in
index 2a0a0d3..2a0a0d3 100644
--- a/swfdec-player.desktop.in
+++ b/data/swfdec-player.desktop.in
diff --git a/swfdec.xml b/data/swfdec.xml
index f72e935..f72e935 100644
--- a/swfdec.xml
+++ b/data/swfdec.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8cee494..23e9ed4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,10 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
+data/swfdec-player.desktop.in
player/swfdec-player.c
player/swfdec-player.ui
player/swfdec-window-handlers.c
player/swfdec-window.c
-swfdec-player.desktop.in
thumbnailer/swfdec-thumbnailer.schemas.in