From acc82b617ddbee05e509392c09e2729bc2fc1911 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 12 Nov 2012 23:51:27 -0600 Subject: Migrate to TDE build system and fix crashes --- tdegtk/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tdegtk/Makefile.am') diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am index 4d18449..3f92391 100644 --- a/tdegtk/Makefile.am +++ b/tdegtk/Makefile.am @@ -1,8 +1,9 @@ +INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde + source_h = \ $(srcdir)/tdegtk.h \ $(srcdir)/exponential-blur.h \ $(srcdir)/gtkroundedboxprivate.h \ - $(srcdir)/raico-blur.h \ $(srcdir)/tdegtk-cairo-support.h \ $(srcdir)/tdegtk-draw.h \ $(srcdir)/tdegtk-engine.h \ @@ -22,7 +23,6 @@ source_h = \ source_c = \ $(srcdir)/exponential-blur.c \ $(srcdir)/gtkroundedbox.c \ - $(srcdir)/raico-blur.c \ $(srcdir)/tdegtk-cairo-support.c \ $(srcdir)/tdegtk-draw.cpp \ $(srcdir)/tdegtk-engine.c \ @@ -36,25 +36,25 @@ source_c = \ $(srcdir)/tdegtk-baseengine.cpp \ $(srcdir)/tdegtk-theme.cpp -enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/theming-engines +enginedir = $(GTK3_PREFIX)/lib/gtk-3.0/$(GTK3_VERSION)/theming-engines engine_LTLIBRARIES = libtdegtk.la libtdegtk_la_SOURCES = $(source_h) $(source_c) -libtdegtk_la_CFLAGS = $(TDEGTK_CFLAGS) -libtdegtk_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) -I/usr/include/tqt -I/usr/include/tqt3 -I/opt/trinity/include $(TDEGTK_CFLAGS) +libtdegtk_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) +libtdegtk_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtdegtk_la_LIBADD = $(TDEGTK_LIBADD) libtqtcairo.la -ltqt -ltqt-mt -L/opt/trinity/lib -ltdecore +libtdegtk_la_LIBADD = $(TDEGTK_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) -libtdegtk_la_LDFLAGS = $(TDEGTK_LDFLAGS) +libtdegtk_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) lib_LTLIBRARIES = libtqtcairo.la libtqtcairo_la_SOURCES = tqtcairopainter.h tqtcairopainter.cpp -libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) -libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) -I/usr/include/tqt -I/usr/include/tqt3 $(TDEGTK_CFLAGS) +libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) +libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) -libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) +libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) -- cgit v1.2.1