[california/wip/725765-desktop] First pass -- this may be all that's needed



commit 364d9dad52f38658b1380811e6f1217a4e78d099
Author: Jim Nelson <jim yorba org>
Date:   Tue Apr 15 16:23:56 2014 -0700

    First pass -- this may be all that's needed

 Makefile.am                   |    6 ++++++
 configure.ac                  |   24 +++++++++++++-----------
 data/Makefile.am              |   18 ++++++++++++++++++
 data/california.desktop.in.in |   15 +++++++++++++++
 4 files changed, 52 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a071e68..4200fb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,8 @@ EXTRA_DIST = \
        intltool-update.in\
        $(NULL)
 
+CLEANFILES =
+
 DISTCLEANFILES = \
        configure \
        config.guess \
@@ -81,4 +83,8 @@ GITIGNOREFILES += \
 devclean:
        $(MAKE) -C src devclean
 
+include data/Makefile.am
+
+ INTLTOOL_DESKTOP_RULE@
+
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index dcdd335..1f0e1b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,16 +32,16 @@ LIBSOUP_REQUIRED=2.44
 GDATA_REQUIRED=0.14.0
 GOA_REQUIRED=3.8.3
 
-PKG_CHECK_MODULES(CALIFORNIA, \
-       glib-2.0 >= $GLIB_REQUIRED \
-       gobject-2.0 >= $GLIB_REQUIRED \
-       gtk+-3.0 >= $GTK_REQUIRED \
-       gee-0.8 >= $GEE_REQUIRED \
-       libecal-1.2 >= $ECAL_REQUIRED \
-       libsoup-2.4 >= $LIBSOUP_REQUIRED \
-       libgdata >= $GDATA_REQUIRED \
-       goa-1.0 >= $GOA_REQUIRED \
-)
+PKG_CHECK_MODULES(CALIFORNIA, [
+       glib-2.0 >= $GLIB_REQUIRED
+       gobject-2.0 >= $GLIB_REQUIRED
+       gtk+-3.0 >= $GTK_REQUIRED
+       gee-0.8 >= $GEE_REQUIRED
+       libecal-1.2 >= $ECAL_REQUIRED
+       libsoup-2.4 >= $LIBSOUP_REQUIRED
+       libgdata >= $GDATA_REQUIRED
+       goa-1.0 >= $GOA_REQUIRED
+])
 AC_SUBST(CALIFORNIA_CFLAGS)
 AC_SUBST(CALIFORNIA_LIBS)
 
@@ -69,7 +69,9 @@ AM_CONDITIONAL(ENABLE_UNITY, test "x$unity" = "xyes")
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
-       po/Makefile.in])
+       po/Makefile.in
+       data/california.desktop.in
+])
 
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..3ac9766
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,18 @@
+NULL =
+
+data_desktopdir = $(datadir)/applications
+data_desktop_in_files = data/california.desktop.in
+data_desktop_DATA = $(data_desktop_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST += \
+       $(data_desktop_in_files) \
+       $(NULL)
+
+CLEANFILES += \
+       $(data_desktop_DATA) \
+       $(NULL)
+
+DISTCLEANFILES += \
+       $(data_desktop_DATA) \
+       $(NULL)
+
diff --git a/data/california.desktop.in.in b/data/california.desktop.in.in
new file mode 100644
index 0000000..8279e60
--- /dev/null
+++ b/data/california.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+_Name=California
+_Comment=GNOME 3 Calendar
+Exec=california %u
+TryExec=california
+Terminal=false
+Type=Application
+Icon=x-office-calendar
+StartupNotify=true
+Categories=GNOME;GTK;Office;
+MimeType=text/calendar;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=california
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]