diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-05-01 12:52:20 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-05-01 12:52:20 +0200 |
| commit | 23f1f6f93256304eab76cd199408b71a649d82a8 (patch) | |
| tree | 9351a2970ced4a194229c59365a758f5d21c598c /kxsldbg | |
| parent | 132a483427c9cb3eb7c6ac3f4df439030382484c (diff) | |
| download | tdewebdev-23f1f6f93256304eab76cd199408b71a649d82a8.tar.gz tdewebdev-23f1f6f93256304eab76cd199408b71a649d82a8.zip | |
Fix FTBFS with ICU >= 58
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kxsldbg')
| -rw-r--r-- | kxsldbg/Makefile.am | 1 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/Makefile.am | 2 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am | 1 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/Makefile.am | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am index cd95e4ef..2be49866 100644 --- a/kxsldbg/Makefile.am +++ b/kxsldbg/Makefile.am @@ -51,6 +51,7 @@ xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TD # set the include path for X, qt and KDE INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes) +CXXFLAGS += $(ICU_CXXFLAGS) METASOURCES = AUTO diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index 49df715a..b38d50f6 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -13,7 +13,7 @@ libkxsldbgpart_la_SOURCES = dummy.cpp SUBDIRS = libqtnotfier libxsldbg INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes) - +CXXFLAGS += $(ICU_CXXFLAGS) libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_TDEPARTS) diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am b/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am index 82902c19..e55eb875 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am +++ b/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am @@ -6,3 +6,4 @@ libqtnotfier_la_METASOURCES = AUTO libqtnotfier_la_SOURCES = xsldbgthread.cpp xsldbgnotifier.cpp xsldbgevent.cpp xsldbgdebuggerbase.cpp qtnotifier2.cpp INCLUDES = $(XSLDBG_CFLAGS) $(all_includes) +CXXFLAGS += $(ICU_CXXFLAGS) diff --git a/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am b/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am index aaea2e53..330df2f7 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am +++ b/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am @@ -8,5 +8,6 @@ libxsldbg_la_LIBADD = $(LIBXSLT_LIBS) libxsldbg_la_LDFLAGS = $(all_libraries) AM_CPPFLAGS = -DDOCS_PATH=\"$(DOCS_PATH)\" -I.. $(LIBXSLT_CFLAGS) $(all_includes) +CXXFLAGS += $(ICU_CXXFLAGS) KDE_OPTIONS= nofinal |