[Xfce4-commits] [xfce/exo] 10/21: Build exo-open with Gtk3

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository xfce/exo.

commit 8b9aacf0e1a32671da77847abae01da54700ed71
Author: Jonas Kümmerlin <rgcjonas at gmail.com>
Date:   Fri Aug 7 12:53:40 2015 +0200

    Build exo-open with Gtk3
    
    That was easy.
---
 exo-open/Makefile.am | 6 +++---
 exo/Makefile.am      | 2 ++
 exo/exo.h            | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/exo-open/Makefile.am b/exo-open/Makefile.am
index 2526b52..517cbfa 100644
--- a/exo-open/Makefile.am
+++ b/exo-open/Makefile.am
@@ -11,7 +11,7 @@ exo_open_SOURCES =							\
 	main.c
 
 exo_open_CFLAGS =							\
-	$(GTK_CFLAGS)							\
+	$(GTK3_CFLAGS)							\
 	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(GIO_CFLAGS)							\
 	$(GIO_UNIX_CFLAGS)
@@ -20,11 +20,11 @@ exo_open_LDFLAGS =							\
 	-no-undefined
 
 exo_open_LDADD =							\
-	$(GTK_LIBS)							\
+	$(GTK3_LIBS)							\
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GIO_UNIX_LIBS)						\
-	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+	$(top_builddir)/exo/libexo-2.la
 
 desktopdir = $(datadir)/applications
 desktop_in_files =							\
diff --git a/exo/Makefile.am b/exo/Makefile.am
index ac7306b..936cf5a 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -123,6 +123,7 @@ lib_LTLIBRARIES += libexo-2.la
 libexo_2_include_HEADERS =						\
 	exo.h								\
 	exo-config.h							\
+	exo-execute.h							\
 	exo-gdk-pixbuf-extensions.h					\
 	exo-job.h							\
 	exo-simple-job.h						\
@@ -141,6 +142,7 @@ libexo_2_la_SOURCES =							\
 	exo-private.c							\
 	exo-private.h							\
 	exo-config.c							\
+	exo-execute.c							\
 	exo-gdk-pixbuf-extensions.c					\
 	exo-job.c							\
 	exo-simple-job.c						\
diff --git a/exo/exo.h b/exo/exo.h
index e42609a..3615ecd 100644
--- a/exo/exo.h
+++ b/exo/exo.h
@@ -38,6 +38,7 @@
 #include <exo/exo-enum-types.h>
 #include <exo/exo-cell-renderer-icon.h>
 #include <exo/exo-gdk-pixbuf-extensions.h>
+#include <exo/exo-execute.h>
 #include <exo/exo-job.h>
 #include <exo/exo-simple-job.h>
 #include <exo/exo-string.h>
@@ -45,12 +46,12 @@
 #include <exo/exo-icon-view.h>
 #include <exo/exo-toolbars-model.h>
 
+
 #if !GTK_CHECK_VERSION (3, 0, 0)
 #include <libxfce4util/libxfce4util.h>
 
 #include <exo/exo-binding.h>
 #include <exo/exo-cell-renderer-ellipsized-text.h>
-#include <exo/exo-execute.h>
 #include <exo/exo-gtk-extensions.h>
 #include <exo/exo-gobject-extensions.h>
 #include <exo/exo-icon-bar.h>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.