diff options
author | waker <wakeroid@gmail.com> | 2012-05-18 18:45:19 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2012-05-18 18:45:19 +0200 |
commit | ba56a7129b577bedca4fef3304d12ad0022633f1 (patch) | |
tree | 8d55ba39fa0beb1ceb79aadea27aff9eb6bba34b /plugins/gtkui/Makefile.am | |
parent | 689126f328967e5c54ba6783e325e718d683a48b (diff) |
fixed libSM and libICE detection and use
Diffstat (limited to 'plugins/gtkui/Makefile.am')
-rw-r--r-- | plugins/gtkui/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index d87d1221..e630ef0d 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -10,6 +10,7 @@ SM_SOURCES = smclient/eggdesktopfile.h\ smclient/eggsmclient-xsmp.c\ smclient/eggsmclient.c SM_LIBADD = $(SM_LIBS) $(ICE_LIBS) +SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\" endif endif @@ -67,13 +68,13 @@ if HAVE_GTK2 ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES) ddb_gui_GTK2_la_LDFLAGS = -module ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) -ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\" +ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) endif if HAVE_GTK3 ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) ddb_gui_GTK3_la_LDFLAGS = -module ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) -ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\" +ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) endif # fallback lib @@ -85,7 +86,7 @@ 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) -ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 +ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 $(SM_CFLAGS) endif |