Fix FTBFS

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)

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)