[atomato] Switch to Vala and modernize build system
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atomato] Switch to Vala and modernize build system
- Date: Thu, 4 Feb 2016 15:55:29 +0000 (UTC)
commit 7803cc448f47205bf9e2305791796916ea5bab18
Author: Rodrigo Moya <rodrigo gnome-db org>
Date: Sat Nov 7 09:48:31 2015 +0100
Switch to Vala and modernize build system
.gitignore | 2 +
Makefile.am | 2 +-
autogen.sh | 2 +-
configure.in | 27 +--
libatomato/Makefile.am | 22 --
libatomato/atomato-action-provider.c | 71 ------
libatomato/atomato-action-provider.h | 54 -----
libatomato/atomato-action.c | 108 ---------
libatomato/atomato.c | 87 --------
libatomato/atomato.h | 37 ---
libatomato/dbus-action-provider.c | 399 ----------------------------------
libatomato/dbus-action-provider.h | 50 -----
libatomato/shell-action-provider.c | 303 --------------------------
libatomato/shell-action-provider.h | 50 -----
src/Makefile.am | 17 +--
src/atomato-gui.glade | 331 ----------------------------
src/atomato-gui.h | 61 -----
src/gui.c | 49 ----
src/main-window-callbacks.c | 53 -----
src/main-window.c | 157 -------------
src/{main.c => main.vala} | 0
tests/Makefile.am | 3 -
22 files changed, 15 insertions(+), 1870 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/Makefile.am b/Makefile.am
index 3b3610c..8b50b5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libatomato src services tests po
+SUBDIRS = src services tests po
diff --git a/autogen.sh b/autogen.sh
index 9021307..f108266 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="atomato"
REQUIRED_AUTOMAKE_VERSION=1.9
-if [ ! -f "$srcdir/libatomato/atomato.c" ]; then
+if [ ! -f "$srcdir/src/main.vala" ]; then
echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
exit 1
fi
diff --git a/configure.in b/configure.in
index eefb48c..a71bc1a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
AC_INIT([Atomato], [2.15.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=atomato], [atomato])
-AC_CONFIG_SRCDIR([libatomato/atomato.c])
+AC_CONFIG_SRCDIR([src/main.vala])
dnl Useful to call aclocal after 'make'
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
@@ -15,6 +15,7 @@ AC_ISC_POSIX
AC_PROG_CC
AC_HEADER_STDC([])
AM_PROG_LIBTOOL
+AM_PROG_VALAC
GNOME_COMPILE_WARNINGS(yes)
CFLAGS="$CFLAGS $WARN_CFLAGS"
@@ -23,25 +24,18 @@ dnl ******************************************
dnl ** pkg-config dependacy checks **
dnl ******************************************
-
-GTK_REQUIRED=2.5.4
-LIBGLADE_REQUIRED=2.0.0
-GCONF_REQUIRED=1.1.11
-DBUS_REQUIRED=0.60
-
-PKG_CHECK_MODULES(ATOMATO,
- glib-2.0 >= $GTK_REQUIRED
- gobject-2.0 >= $GTK_REQUIRED
- libxml-2.0
- dbus-glib-1 >= $DBUS_REQUIRED)
+VALA_CHECK_MODULES(ATOMATO,
+ glib-2.0
+ gobject-2.0)
AC_SUBST(ATOMATO_CFLAGS)
AC_SUBST(ATOMATO_LIBS)
+AC_SUBST(ATOMATO_VALAFLAGS)
-PKG_CHECK_MODULES(ATOMATO_GUI,
- libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED)
+VALA_CHECK_MODULES(ATOMATO_GUI, gtk+-3.0)
AC_SUBST(ATOMATO_GUI_CFLAGS)
AC_SUBST(ATOMATO_GUI_LIBS)
+AC_SUBST(ATOMATO_GUI_VALAFLAGS)
+
dnl
dnl Translations
@@ -56,12 +50,9 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
-GNOME_DOC_INIT
-
AC_CONFIG_FILES([
Makefile
po/Makefile.in
-libatomato/Makefile
src/Makefile
services/Makefile
services/desktop/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index cbd0b86..604584d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,21 +1,8 @@
-gladedir = $(datadir)/atomato
-glade_DATA = atomato-gui.glade
-
-INCLUDES = \
- -DATOMATO_GLADE_DIR="\"$(gladedir)\"" \
- $(ATOMATO_CFLAGS) \
- $(ATOMATO_GUI_CFLAGS)
-
bin_PROGRAMS = atomato
atomato_SOURCES = \
- atomato-gui.h \
- gui.c \
- main.c \
- main-window.c \
- main-window-callbacks.c
+ main.vala
atomato_LDADD = \
$(ATOMATO_LIBS) \
- $(ATOMATO_GUI_LIBS) \
- $(top_builddir)/libatomato/libatomato.la
+ $(ATOMATO_GUI_VALAFLAGS)
diff --git a/src/main.c b/src/main.vala
similarity index 100%
rename from src/main.c
rename to src/main.vala
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 702139e..1a801c2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,6 @@
noinst_PROGRAMS = \
test-list-actions
-INCLUDES = \
- $(ATOMATO_CFLAGS)
-
test_list_actions_SOURCES = test-list-actions.c
test_list_actions_LDADD = \
$(ATOMATO_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]