From fce75237d50257fcf791e0b496d917abf819d330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 8 Sep 2020 05:03:33 +0200 Subject: Fix FTBFS due to automake stuff. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- plugins/infowidget/Makefile.am | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/infowidget/Makefile.am b/plugins/infowidget/Makefile.am index 5efb8c4..ace5e0d 100644 --- a/plugins/infowidget/Makefile.am +++ b/plugins/infowidget/Makefile.am @@ -1,5 +1,14 @@ INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) METASOURCES = AUTO + +if USE_SYSTEM_GEOIP +libgeoip_system = -lGeoIP +else +libgeoip_builtin = libgeoip_builtin.la +endif + +noinst_LTLIBRARIES = $(libgeoip_builtin) + kde_module_LTLIBRARIES = ktinfowidgetplugin.la noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h GeoIP.h \ statustab.h fileview.h @@ -9,21 +18,19 @@ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \ infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp floatspinbox.cpp \ localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp fileview.cpp +libgeoip_builtin_la_SOURCES = GeoIP.c + # Libs needed by the plugin ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) + $(libgeoip_builtin) # LD flags for the plugin # -module says: this is a module, i.e. something you're going to dlopen # so e.g. it has no version number like a normal shared lib would have. -ktinfowidgetplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -if USE_SYSTEM_GEOIP -ktinfowidgetplugin_la_LDFLAGS += -lGeoIP -else -ktinfowidgetplugin_la_SOURCES += GeoIP.c -endif +ktinfowidgetplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(libgeoip_system) # rc file containing the GUI for the plugin # pluginsdir = $(kde_datadir)/ktsearchplugin -- cgit v1.2.1