You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.5 KiB
33 lines
1.5 KiB
commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08
|
|
Author: Slávek Banko <slavek.banko@axis.cz>
|
|
Date: Fri Sep 24 14:54:59 2021 +0200
|
|
|
|
Fix FTBFS in case TQt3 is not installed in the system directory.
|
|
|
|
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
|
(cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989)
|
|
|
|
diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am
|
|
index 54a5db3..f1886dc 100644
|
|
--- a/tdegtk/Makefile.am
|
|
+++ b/tdegtk/Makefile.am
|
|
@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c)
|
|
libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
|
libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
|
|
|
-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 = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
|
+libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
|
|
+libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
|
|
|
lib_LTLIBRARIES = libtqtcairo.la
|
|
|
|
@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
|
libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
|
|
|
|
libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI)
|
|
-
|
|
-libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|
|
+libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
|