diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-17 20:36:36 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-17 20:36:36 +0200 |
| commit | 50bf8f8d4c7fd03714cb5c80e4f89532be2ef30b (patch) | |
| tree | 2636e7876ad6f9a33362abe6fea64ef35dc5da8d | |
| parent | e77aa39e87de5bcec28e2d47bb8bf4ef23e3ff0d (diff) | |
| download | gtk3-tqt-engine-50bf8f8d4c7fd03714cb5c80e4f89532be2ef30b.tar.gz gtk3-tqt-engine-50bf8f8d4c7fd03714cb5c80e4f89532be2ef30b.zip | |
Fix FTBFS
| -rw-r--r-- | tdegtk/Makefile.am | 16 | ||||
| -rw-r--r-- | tests/Makefile.am | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am index bc23cc1..5ae9774 100644 --- a/tdegtk/Makefile.am +++ b/tdegtk/Makefile.am @@ -41,20 +41,20 @@ engine_LTLIBRARIES = libtdegtk.la libtdegtk_la_SOURCES = $(source_h) $(source_c) -libtdegtk_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtdegtk_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) +libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) +libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtdegtk_la_LIBADD = $(TDEGTK_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) +libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -libtdegtk_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) +libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) lib_LTLIBRARIES = libtqtcairo.la libtqtcairo_la_SOURCES = tqtcairopainter.h tqtcairopainter.cpp -libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) +libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) +libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) $(LIB_QT) $(LIB_TDEUI) +libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI) -libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) +libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index e4a4c40..1010a2e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,15 +9,15 @@ noinst_PROGRAMS = \ test_widgets_CFLAGS = \ -I$(top_srcdir) \ - $(TDEGTK_CFLAGS) \ + $(KDE_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GTK3_CFLAGS) test_widgets_LDADD = \ - $(TDEGTK_LIBADD) + $(KDE_LIBADD) test_widgets_LDFLAGS = \ - $(TDEGTK_LDFLAGS) \ + $(KDE_LDFLAGS) \ $(CAIRO_LIBS) \ $(GTK3_LIBS) @@ -26,14 +26,14 @@ test_painter_SOURCES = test-painter.cpp test_painter_CXXFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/tdegtk \ - $(TDEGTK_CFLAGS) \ + $(KDE_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GTK3_CFLAGS) test_painter_LDADD = \ - $(TDEGTK_LIBADD) ../tdegtk/libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(LIB_QT) $(LIB_TDEUI) + $(KDE_LIBADD) ../tdegtk/libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(LIB_QT) $(LIB_TDEUI) test_painter_LDFLAGS = \ - $(TDEGTK_LDFLAGS) \ + $(KDE_LDFLAGS) \ $(CAIRO_LIBS) \ $(GTK3_LIBS) |