summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am43
-rw-r--r--gtk/gtkbuilder.h1
-rw-r--r--gtk/gtkcolorsel.c3
-rw-r--r--gtk/gtkdnd-quartz.c4
-rw-r--r--gtk/gtkdnd.c4
-rw-r--r--gtk/gtklayout.c2
-rw-r--r--gtk/gtkliststore.h1
-rw-r--r--gtk/gtkmain.c3
-rw-r--r--gtk/gtkrc.c2
-rw-r--r--gtk/gtksearchengine.c4
-rw-r--r--gtk/gtktextchild.h2
-rw-r--r--gtk/gtktreemodelfilter.h1
-rw-r--r--gtk/gtktreemodelsort.h2
-rw-r--r--gtk/gtktreestore.h2
-rw-r--r--gtk/tests/Makefile.am6
15 files changed, 29 insertions, 51 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 62be9e1bfe..32b377b4f6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -109,8 +109,8 @@ TESTS = abicheck.sh
endif
libgtkincludedir = $(includedir)/gtk-3.0/gtk
-libadd = \
- $(top_builddir)/gdk/$(gdktargetlib) \
+libadd = \
+ $(top_builddir)/gdk/libgdk-3.0.la \
$(GTK_DEP_LIBS)
deps =
@@ -866,7 +866,7 @@ gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
gtktestutils.c: gtktypefuncs.c
# target platform:
-lib_LTLIBRARIES = $(gtktargetlib)
+lib_LTLIBRARIES = libgtk-3.0.la
gtkincludedir = $(includedir)/gtk-3.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
@@ -874,30 +874,22 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_3_0_la_LDFLAGS = $(libtool_opts)
+libgtk_3_0_la_LIBADD = $(libadd)
+libgtk_3_0_la_DEPENDENCIES = $(deps)
-libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
-libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
-
-libgtk_x11_3_0_la_LIBADD = $(libadd)
-libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_quartz_3_0_la_LIBADD = $(libadd)
-
-libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
-libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
-libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
+#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+#libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+#libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
if USE_WIN32
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif
-EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
- $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
+ $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la
endif
if USE_QUARTZ
@@ -944,13 +936,13 @@ distclean-local:
rm -f $(MAINTAINERCLEANFILES); \
fi
-DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
+DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la
TEST_DEPS = $(DEPS) immodules.cache
LDADDS = \
- $(gtktargetlib) \
- $(top_builddir)/gdk/$(gdktargetlib) \
+ libgtk-3.0.la \
+ $(top_builddir)/gdk/libgdk-3.0.la \
$(GTK_DEP_LIBS)
if HAVE_INTROSPECTION
@@ -960,7 +952,7 @@ introspection_files = \
gtktypebuiltins.h \
gtktypebuiltins.c
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
if USE_X11
Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
@@ -971,10 +963,7 @@ Gtk_3_0_gir_CFLAGS = \
-UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = $(gtktargetlib)
-if USE_X11
-Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la
-endif
+Gtk_3_0_gir_LIBS = libgtk-3.0.la
Gtk_3_0_gir_FILES = $(introspection_files)
INTROSPECTION_GIRS += Gtk-3.0.gir
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 298e3e8aed..cdbd06f673 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -25,7 +25,6 @@
#ifndef __GTK_BUILDER_H__
#define __GTK_BUILDER_H__
-#include <gdkconfig.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index d0debfca3c..2f029ac333 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -32,8 +32,7 @@
#include <math.h>
#include <string.h>
-#include "gdkconfig.h"
-#include "gdk/gdkkeysyms.h"
+#include "gdk/gdk.h"
#include "gtkhsv.h"
#include "gtkwindow.h"
#include "gtkselection.h"
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 0f35cbadfc..858f9c2d34 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -29,9 +29,7 @@
#include <stdlib.h>
#include <string.h>
-#include "gdkconfig.h"
-
-#include "gdk/gdkkeysyms.h"
+#include "gdk/gdk.h"
#include "gtkdnd.h"
#include "gtkiconfactory.h"
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 3e56216ace..502e21b6e6 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -30,9 +30,7 @@
#include <stdlib.h>
#include <string.h>
-#include "gdkconfig.h"
-
-#include "gdk/gdkkeysyms.h"
+#include "gdk/gdk.h"
#ifdef GDK_WINDOWING_X11
#include <X11/Xlib.h>
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 2815b642b2..bf43bd83e8 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -32,7 +32,7 @@
#include "gtklayout.h"
-#include "gdkconfig.h"
+#include "gdk/gdk.h"
#include "gtkprivate.h"
#include "gtkintl.h"
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 594fc329c8..d05305b23b 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -24,7 +24,6 @@
#ifndef __GTK_LIST_STORE_H__
#define __GTK_LIST_STORE_H__
-#include <gdkconfig.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 861ab0f44a..dc272600fe 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -29,7 +29,7 @@
#include "gtkmain.h"
#include <glib.h>
-#include "gdkconfig.h"
+#include "gdk/gdk.h"
#include <locale.h>
@@ -64,7 +64,6 @@
#include "gtktooltip.h"
#include "gtkdebug.h"
#include "gtkmenu.h"
-#include "gdk/gdkkeysyms.h"
#ifdef G_OS_WIN32
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 5f726bd23f..44b0371479 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -42,7 +42,7 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "gdkconfig.h"
+#include "gdk/gdk.h"
#include "gtkversion.h"
#include "gtkrc.h"
diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
index 2b2274e655..eac7eb628c 100644
--- a/gtk/gtksearchengine.c
+++ b/gtk/gtksearchengine.c
@@ -27,13 +27,13 @@
#include "gtksearchenginetracker.h"
#include "gtksearchenginequartz.h"
-#include <gdk/gdkconfig.h> /* for GDK_WINDOWING_QUARTZ */
+#include <gdk/gdk.h> /* for GDK_WINDOWING_QUARTZ */
#ifndef G_OS_WIN32 /* Beagle and tracker are not ported
* to Windows, as far as I know.
*/
-#define HAVE_BEAGLE 1
+#define HAVE_BEAGLE 1
#define HAVE_TRACKER 1
#endif
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index dd132f4278..afcbadf8c7 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -31,7 +31,7 @@
#ifndef __GTK_TEXT_CHILD_H__
#define __GTK_TEXT_CHILD_H__
-#include <gdkconfig.h>
+#include <gdk/gdk.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 1dc097a5d8..b8c3376886 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -25,7 +25,6 @@
#ifndef __GTK_TREE_MODEL_FILTER_H__
#define __GTK_TREE_MODEL_FILTER_H__
-#include <gdkconfig.h>
#include <gtk/gtktreemodel.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 7645761389..90cc3c31a1 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -24,7 +24,7 @@
#ifndef __GTK_TREE_MODEL_SORT_H__
#define __GTK_TREE_MODEL_SORT_H__
-#include <gdkconfig.h>
+#include <gdk/gdk.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 5fba118d16..0f151d4702 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -24,7 +24,7 @@
#ifndef __GTK_TREE_STORE_H__
#define __GTK_TREE_STORE_H__
-#include <gdkconfig.h>
+#include <gdk/gdk.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
#include <stdarg.h>
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 186880b11c..35105d329f 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -11,12 +11,10 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk/$(gdktargetlib) \
- $(top_builddir)/gtk/$(gtktargetlib)
+ $(top_builddir)/gtk/libgtk-3.0.la
progs_ldadd = \
- $(top_builddir)/gdk/$(gdktargetlib) \
- $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
View Lorry Controller Status