r2227 - in trunk/src/target/OM-2007/applications/openmoko-dialer: . data src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-06-12 17:40:05 +0200 (Tue, 12 Jun 2007)
New Revision: 2227

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h
Log:
* openmoko-dialer: Apply patch from bug 532 (make distcheck and autotools-related improvements)


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac	2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac	2007-06-12 15:40:05 UTC (rev 2227)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(openmoko-dialer, %(APPVERSION), %(APPCONTACT))
+AC_INIT(openmoko-dialer, 0.1, http://www.openmoko.org/)
 AM_INIT_AUTOMAKE()
 AC_CONFIG_SRCDIR(src/dialer-main.c)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am	2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am	2007-06-12 15:40:05 UTC (rev 2227)
@@ -1,7 +1,7 @@
+# A shell check command that I find convenient:
+# ls -1 *.png | xargs --replace=pngimg sh -c '(grep -qw "pngimg" Makefile.am  || echo "Missing pngimg")'
 
-resourcedir = $(pkgdatadir)
-
-EXTRA_DIST =unkown.png\
+dist_pkgdata_DATA =unkown.png\
                 dialed.png\
                 missed.png\
                 received.png\
@@ -10,38 +10,6 @@
                 phone.png\
                 delete.png\
                 dtmf.png\
-                sms.png\
-                all.png\
-                history.png\
-                delete_01.png\
-                answer.png\
-                cancel.png\
-                hangup.png\
-                redial.png\
-                failure.png\
-                incoming_0.png\
-                incoming_1.png\
-                incoming_2.png\
-                incoming_3.png\
-                outgoing_0.png\
-                outgoing_1.png\
-                outgoing_2.png\
-                outgoing_3.png\
-                talking_0.png\
-                talking_1.png\
-                talking_2.png\
-                talking_3.png\
-                exit.png
-                
-resource_DATA =unkown.png\
-                dialed.png\
-                missed.png\
-                received.png\
-                speaker.png\
-                email.png\
-                phone.png\
-                delete.png\
-                dtmf.png\
                 talking.png\
                 sms.png\
                 all.png\
@@ -64,7 +32,9 @@
                 talking_1.png\
                 talking_2.png\
                 talking_3.png\
-                exit.png
+                exit.png\
+		connecting.png\
+		incall.png
 #
 # desktop integration: .desktop file
 #

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am	2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am	2007-06-12 15:40:05 UTC (rev 2227)
@@ -21,7 +21,27 @@
 dialer-window-talking.c\
 dialer-window-pin.c\
 moko-dialer-status.c\
-alsa.c
+alsa.c \
+alsa.h \
+common.h \
+contacts.h \
+dialer-callbacks-connection.h \
+dialer-main.h \
+dialer-window-dialer.h \
+dialer-window-history.h \
+dialer-window-incoming.h \
+dialer-window-outgoing.h \
+dialer-window-pin.h \
+dialer-window-talking.h \
+error.h \
+moko-dialer-autolist.h \
+moko-dialer-declares.h \
+moko-dialer-includes.h \
+moko-dialer-panel.h \
+moko-dialer-status.h \
+moko-dialer-textview.h \
+moko-dialer-tip.h \
+moko-digit-button.h
 
 openmoko_dialer_LDADD = @LIBS@
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h	2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h	2007-06-12 15:40:05 UTC (rev 2227)
@@ -17,6 +17,11 @@
 #ifndef ALSA_H
 #define ALSA_H
 
+/* The following define is used to refrain the compiler from
+ * stopping with an error while the ALSA headers fails with
+ * ANSI C source.
+ */
+#define _POSIX_C_SOURCE 199309
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
 #include <alsa/asoundlib.h>