[SCM] Alternate GUI branch, master, updated. 77e8b3113745574b21f26c42d690b7b5b5f88d40

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Alternate GUI".

The branch, master has been updated
       via  77e8b3113745574b21f26c42d690b7b5b5f88d40 (commit)
      from  238cf3d13e4852acaf383615cbe9afa424e554f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii/gnocky.git/commit/?id=77e8b3113745574b21f26c42d690b7b5b5f88d40


commit 77e8b3113745574b21f26c42d690b7b5b5f88d40
Author: Daniele Forsi <address@hidden>
Date:   Sun Jun 19 15:39:40 2011 +0200

    Fix make distcheck
    
    Use SUBDIRS variable.

diff --git a/Makefile.am b/Makefile.am
index f984e69..1f517a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,42 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl m4 po src
+SUBDIRS = intl pixmaps po src
 
 EXTRA_DIST = \
        autogen.sh \
        TODO \
        BUGS
 
-install-data-local:
-       @$(NORMAL_INSTALL)
-       if test -d $(srcdir)/pixmaps; then \
-         $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
-         for pixmap in $(srcdir)/pixmaps/*; do \
-           if test -f $$pixmap; then \
-             $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
-           fi \
-         done \
-       fi
-       if test -d $(srcdir)/pixmaps/phones; then \
-         $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps/phones; \
-         find $(srcdir)/pixmaps/phones -maxdepth 1 -type f \
-               -exec $(INSTALL_DATA) {} $(DESTDIR)$(pkgdatadir)/pixmaps/phones 
\; ; \
-       fi
-
 dist-hook:
-       if test -d pixmaps; then \
-         mkdir $(distdir)/pixmaps; \
-         for pixmap in pixmaps/*; do \
-           if test -f $$pixmap; then \
-             cp -p $$pixmap $(distdir)/pixmaps; \
-           fi \
-         done \
-       fi
-       if test -d pixmaps/phones; then \
-         mkdir $(distdir)/pixmaps/phones; \
-         find pixmaps/phones -maxdepth 1 -type f \
-               -exec cp -p {} $(distdir)/pixmaps/phones \; ; \
-       fi
        if test -d glade-translations/; then \
          mkdir $(distdir)/glade-translations; \
          for file in glade-translations/*.c; do \
diff --git a/configure.in b/configure.in
index dff6197..1d1e9dc 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AM_PROG_CC_STDC
 AC_HEADER_STDC
 
 AC_CHECK_HEADERS(libintl.h)
-AM_GNU_GETTEXT([use-libtool])
+AM_GNU_GETTEXT()
 
 pkg_modules="gtk+-2.0 >= 2.4.0, glib-2.0 >= 2.0.0, gthread-2.0 >= 2.0.0, 
libglade-2.0 >= 2.0, gnokii >= 0.6.14"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
@@ -39,8 +39,10 @@ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 AC_OUTPUT([
 Makefile
 intl/Makefile
-m4/Makefile
+pixmaps/Makefile
+pixmaps/phones/Makefile
 po/Makefile.in
 src/Makefile
+src/glade/Makefile
 src/glade/gnocky-about.glade
 ])
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
new file mode 100644
index 0000000..6dd6e6d
--- /dev/null
+++ b/pixmaps/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = phones
+
+pixmapdir = $(DESTDIR)$(pkgdatadir)/pixmaps
+
+dist_pixmap_DATA = \
+       me.png \
+       sm.png
diff --git a/pixmaps/phones/Makefile.am b/pixmaps/phones/Makefile.am
new file mode 100644
index 0000000..9897b56
--- /dev/null
+++ b/pixmaps/phones/Makefile.am
@@ -0,0 +1,14 @@
+pixmapdir = $(DESTDIR)$(pkgdatadir)/pixmaps/phones
+
+dist_pixmap_DATA = \
+       3210.png \
+       3310.png \
+       3510i.png \
+       6210.png \
+       6310i.png \
+       6310.png \
+       7110.png \
+       c55.png \
+       m55.png \
+       s55.png \
+       unknown.png
diff --git a/src/Makefile.am b/src/Makefile.am
index b7c5ee0..68ac925 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
 # $Id$
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = glade
+
 INCLUDES = \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -31,27 +33,6 @@ gnocky_SOURCES = \
 
 gnocky_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
 
-install-data-local:
-       @$(NORMAL_INSTALL)
-       if test -d $(srcdir)/glade; then \
-         $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/glade; \
-         for pixmap in $(srcdir)/glade/*.png $(srcdir)/glade/*.glade; do \
-           if test -f $$pixmap; then \
-             $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/glade; \
-           fi \
-         done \
-       fi
-
-dist-hook:
-       if test -d glade; then \
-         mkdir $(distdir)/glade; \
-         for pixmap in glade/*.png glade/*.glade; do \
-           if test -f $$pixmap; then \
-             cp -p $$pixmap $(distdir)/glade; \
-           fi \
-         done \
-       fi
-
 desktop_files = gnocky.desktop
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_files)
diff --git a/src/glade/Makefile.am b/src/glade/Makefile.am
new file mode 100644
index 0000000..f2f2369
--- /dev/null
+++ b/src/glade/Makefile.am
@@ -0,0 +1,29 @@
+guidir = $(DESTDIR)$(pkgdatadir)/glade
+
+dist_gui_DATA = \
+       caller-id.png \
+       ellipse-filled.png \
+       ellipse.png \
+       fill.png \
+       gnocky-about.glade \
+       gnocky-addressbook-list-dialog.glade \
+       gnocky-edit-phonebook.glade \
+       gnocky.glade \
+       gnocky-logos-view.glade \
+       gnocky-new-sms.glade \
+       gnocky-phonebook-list-dialog.glade \
+       gnocky-phonebook-view.glade \
+       gnocky-phone-view.glade \
+       gnocky-preferences.glade \
+       gnocky-sms-view.glade \
+       line.png \
+       operator-logo.png \
+       pencil.png \
+       phonebook24x24.png \
+       picture-message.png \
+       read-from-phone.png \
+       rect-filled.png \
+       rect.png \
+       startup-logo.png \
+       tasks.png \
+       write-to-phone.png

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                |   31 +------------------------------
 configure.in               |    6 ++++--
 pixmaps/Makefile.am        |    7 +++++++
 pixmaps/phones/Makefile.am |   14 ++++++++++++++
 src/Makefile.am            |   23 ++---------------------
 src/glade/Makefile.am      |   29 +++++++++++++++++++++++++++++
 6 files changed, 57 insertions(+), 53 deletions(-)
 create mode 100644 pixmaps/Makefile.am
 create mode 100644 pixmaps/phones/Makefile.am
 create mode 100644 src/glade/Makefile.am


hooks/post-receive
-- 
Alternate GUI