1 files changed, 10 insertions, 14 deletions
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index 9fe62058..1dc2f42d 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -80,7 +80,7 @@ endif
 
 # normal lib
 if HAVE_GTK2
-GTKGLEXT_SOURCES_GTK2 = \
+GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES)\
 	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.c\
 	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.h\
 	gtkglext-gtk2/gdk/x11/gdkglcontext-x11.c\
@@ -140,7 +140,7 @@ GTKGLEXT_SOURCES_GTK2 = \
 
 GTKGLEXT_CFLAGS_GTK2 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 
-ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES) $(GTKGLEXT_SOURCES_GTK2)
+ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
 ddb_gui_GTK2_la_LDFLAGS = -module
 
 if STATICLINK
@@ -158,12 +158,8 @@ endif
 endif
 
 if HAVE_GTK3
-if OS_OSX
-AM_CPPFLAGS = $(CXXFLAGS) $(GTK3_DEPS_CFLAGS)
-GTK3_OSX_SOURCES = retina.m
-GTKGLEXT_SOURCES_GTK3 =
-else
-GTKGLEXT_SOURCES_GTK3 = \
+GTK3_OSX_SOURCES =
+GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES)\
 	gtkglext-gtk3/gtk/gtkglinit.c\
 	gtkglext-gtk3/gtk/gtkglversion.c\
 	gtkglext-gtk3/gtk/gtkglwidget.c\
@@ -221,23 +217,23 @@ GTKGLEXT_SOURCES_GTK3 = \
 	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h\
 	gtkglext-gtk3/gdk/gdkglext-config.h\
 	gtkglext-gtk3/gdk/gdkglversion.h
-endif
 
 GTKGLEXT_CFLAGS_GTK3 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 
-ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) $(GTKGLEXT_SOURCES_GTK3) $(GTK3_OSX_SOURCES)
 ddb_gui_GTK3_la_LDFLAGS = -module
 
 if STATICLINK
+ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
 GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0
 
-ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) $(GTKGLEXT_LIBS) ../libparser/libparser.a
+ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT_LIBS)
 
 ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
 
 else
-ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) $(GTK_MAC_LIBS) ../libparser/libparser.a
-ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) $(GTK_MAC_CFLAGS)
+ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT_LIBS)
+ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
 endif
 endif
 
@@ -245,7 +241,7 @@ endif
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
-ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES)
+ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
 ddb_gui_GTK2_fallback_la_LDFLAGS = -module
 
 ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT_LIBS)