diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-21 13:20:14 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-21 13:20:14 -0800 |
| commit | a3386c29ef7d0ee53e6504063a2c7385e3f111cd (patch) | |
| tree | 6b50adf8cb01da4341b4c1b5d712910993e6abda | |
| parent | 692f171232509da0704a3d7a8f752306fb0c2323 (diff) | |
| parent | b6c5615c2ac8124dadd5cc968cb0669028c18222 (diff) | |
| download | atril-a3386c29ef7d0ee53e6504063a2c7385e3f111cd.tar.bz2 atril-a3386c29ef7d0ee53e6504063a2c7385e3f111cd.tar.xz | |
Merge pull request #56 from infirit/master
Fixes for building with gtk3
| -rw-r--r-- | cut-n-paste/smclient/eggsmclient-private.h | 1 | ||||
| -rw-r--r-- | libdocument/Makefile.am | 4 | ||||
| -rw-r--r-- | libview/Makefile.am | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/cut-n-paste/smclient/eggsmclient-private.h b/cut-n-paste/smclient/eggsmclient-private.h index fc3a0a2d..4f8572fe 100644 --- a/cut-n-paste/smclient/eggsmclient-private.h +++ b/cut-n-paste/smclient/eggsmclient-private.h @@ -20,7 +20,6 @@ #ifndef __EGG_SM_CLIENT_PRIVATE_H__ #define __EGG_SM_CLIENT_PRIVATE_H__ -#include <gdkconfig.h> #include "eggsmclient.h" G_BEGIN_DECLS diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am index b3ea2c5f..b3e79c0c 100644 --- a/libdocument/Makefile.am +++ b/libdocument/Makefile.am @@ -159,9 +159,9 @@ AtrilDocument-$(EV_API_VERSION).gir: libatrildocument.la Makefile $(INST_H_FILES --nsversion=$(EV_API_VERSION) \ --include=GLib-2.0 \ --include=Gio-2.0 \ - --include=Gdk-2.0 \ + --include=Gdk-$(GTK_API_VERSION) \ --include=GdkPixbuf-2.0 \ - --include=Gtk-2.0 \ + --include=Gtk-$(GTK_API_VERSION) \ --library=atrildocument \ --libtool="$(SAVED_LIBTOOL)" \ --output $@ \ diff --git a/libview/Makefile.am b/libview/Makefile.am index 4be99e61..7dd0a950 100644 --- a/libview/Makefile.am +++ b/libview/Makefile.am @@ -127,9 +127,9 @@ AtrilView-$(EV_API_VERSION).gir: libatrilview.la Makefile $(INST_H_FILES) $(filt --include=GLib-2.0 \ --include=GObject-2.0 \ --include=Gio-2.0 \ - --include=Gdk-2.0 \ + --include=Gdk-$(GTK_API_VERSION) \ --include=GdkPixbuf-2.0 \ - --include=Gtk-2.0 \ + --include=Gtk-$(GTK_API_VERSION) \ --include=AtrilDocument-$(EV_API_VERSION) \ --library=atrilview \ --libtool="$(LIBTOOL)" \ |