move icons and desktop files under data, fix 'make dist'

git-svn-id: svn+ssh://garage/svnroot/maemo-recorder/trunk@19 2441f5eb-5316-0410-9386-a49b32a51a4a

diff --git a/Makefile.am b/Makefile.am
index 205b81f..71af7c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,8 @@
 # The subdirs
 SUBDIRS = src \
-         mime 
+         mime \
+         data
 
-desktopdir = $(datadir)/applications/hildon
-desktop_DATA = maemo_recorder.desktop
-
-servicedir = /usr/share/dbus-1/services
-service_DATA = maemo_recorder.service
-
-pixmapdir = /usr/share/pixmaps
-pixmap_DATA = maemo_recorder.png
-
-gstplugindir = /usr/lib/gstreamer-0.10
-gstplugin_DATA = data/libgstwavenc.so
-
-# The backup/restore configuration
 
 EXTRA_DIST =                                   \
        README                                  \
@@ -24,11 +12,7 @@ EXTRA_DIST =                                 \
         debian/compat                          \
         debian/copyright                       \
         debian/control                         \
-        debian/rules                           \
-        debian/hello-world-app.links           \
-        maemo_recorder.desktop                 \
-        maemo_recorder.service                 \
-       maemo_recorder.png
+        debian/rules                           
 
 deb: dist
        -mkdir $(top_builddir)/debian-build

diff --git a/configure.ac b/configure.ac
index 1befd9d..e66da5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(maemo_recorder, 0.0.18)
+AM_INIT_AUTOMAKE(maemo-recorder, 0.0.18)
 
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -82,5 +82,6 @@ AC_SUBST(OSSO_UPDATE_MIME)
 
 AC_OUTPUT([ Makefile \
            src/Makefile \
-           mime/Makefile ])
+           mime/Makefile \
+           data/Makefile ])
 

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644 (file)
index 0000000..009044c
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,17 @@
+desktopdir = $(datadir)/applications/hildon
+desktop_DATA = maemo_recorder.desktop
+
+servicedir = /usr/share/dbus-1/services
+service_DATA = maemo_recorder.service
+
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = maemo_recorder.png
+
+gstplugindir = /usr/lib/gstreamer-0.10
+gstplugin_DATA = libgstwavenc.so
+
+EXTRA_DIST =                                   \
+        maemo_recorder.desktop                 \
+        maemo_recorder.service                 \
+       maemo_recorder.png                      \
+       libgstwavenc.so

diff --git a/data/maemo_recorder.desktop b/data/maemo_recorder.desktop
new file mode 100644 (file)
index 0000000..d5fb059
--- /dev/null
+++ b/data/maemo_recorder.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Maemo Recorder
+Exec=/usr/bin/maemo_recorder
+Icon=maemo_recorder
+X-Window-Icon=maemo_recorder
+X-Window-Icon-Dimmed=maemo_recorder
+X-Icon-path=/usr/share/pixmaps/
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Service=com.nokia.maemo_recorder
+X-Osso-Type=application/x-executable
+MimeType=audio/basic;audio/x-raw-ilbc;audio/x-mp3;audio/x-wav
+StartupWMClass=maemo_recorder

diff --git a/data/maemo_recorder.png b/data/maemo_recorder.png
new file mode 100644 (file)
index 0000000..01d66be
Binary files /dev/null and b/data/maemo_recorder.png differ

diff --git a/data/maemo_recorder.service b/data/maemo_recorder.service
new file mode 100644 (file)
index 0000000..7052659
--- /dev/null
+++ b/data/maemo_recorder.service
@@ -0,0 +1,4 @@
+# Maemo Recorder service description file
+[D-BUS Service]
+Name=com.nokia.maemo_recorder
+Exec=/usr/bin/maemo_recorder

diff --git a/maemo_recorder.desktop b/maemo_recorder.desktop
deleted file mode 100644 (file)
index d5fb059..0000000
--- a/maemo_recorder.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Name=Maemo Recorder
-Exec=/usr/bin/maemo_recorder
-Icon=maemo_recorder
-X-Window-Icon=maemo_recorder
-X-Window-Icon-Dimmed=maemo_recorder
-X-Icon-path=/usr/share/pixmaps/
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Service=com.nokia.maemo_recorder
-X-Osso-Type=application/x-executable
-MimeType=audio/basic;audio/x-raw-ilbc;audio/x-mp3;audio/x-wav
-StartupWMClass=maemo_recorder

diff --git a/maemo_recorder.png b/maemo_recorder.png
deleted file mode 100644 (file)
index 01d66be..0000000
Binary files a/maemo_recorder.png and /dev/null differ

diff --git a/maemo_recorder.service b/maemo_recorder.service
deleted file mode 100644 (file)
index 7052659..0000000
--- a/maemo_recorder.service
+++ /dev/null
@@ -1,4 +0,0 @@
-# Maemo Recorder service description file
-[D-BUS Service]
-Name=com.nokia.maemo_recorder
-Exec=/usr/bin/maemo_recorder

diff --git a/src/Makefile.am b/src/Makefile.am
index c13ca83..f44a8fd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,6 @@
 
 bin_PROGRAMS = maemo_recorder
 
-maemo_recorder_SOURCES = maemo-recorder.c maemo-recorder-ui.c maemo-recorder-file.c maemo-recorder-au.c settings.c
+maemo_recorder_SOURCES = maemo-recorder.c maemo-recorder.h maemo-recorder-ui.c maemo-recorder-ui.h maemo-recorder-file.c maemo-recorder-file.h maemo-recorder-au.c maemo-recorder-au.h settings.c settings.h
 maemo_recorder_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_LGPL_CFLAGS) $(GSTREAMER_CFLAGS) $(HILDON_FM_CFLAGS) $(GNOME_VFS_CFLAGS) $(OSSO_EMAIL_CFLAGS)
 maemo_recorder_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LGPL_LIBS) $(GSTREAMER_LIBS) $(HILDON_FM_LIBS) $(GNOME_VFS_LIBS) $(OSSO_EMAIL_LIBS)