Fix FTBFS due to link module to shared library

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 8 years ago
parent 1e2161224b
commit 2c9119a5ef

@ -17,4 +17,8 @@ domino_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(KDE_RPATH)
domino_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_QT) -lkdefx -lXrender -lXft $(LIB_KDECORE) domino_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_QT) -lkdefx -lXrender -lXft $(LIB_KDECORE)
domino_la_METASOURCES = AUTO domino_la_METASOURCES = AUTO
noinst_LTLIBRARIES = libdomino_style.la
libdomino_style_la_SOURCES =
libdomino_style_la_LIBADD = $(domino_la_OBJECTS) $(domino_la_LIBADD)
DISTCLEANFILES = $(domino_la_METASOURCES) DISTCLEANFILES = $(domino_la_METASOURCES)

@ -3,6 +3,6 @@ INCLUDES = $(all_includes) -I/usr/include/freetype2
noinst_HEADERS = dominoconf.h noinst_HEADERS = dominoconf.h
kde_module_LTLIBRARIES = kstyle_domino_config.la kde_module_LTLIBRARIES = kstyle_domino_config.la
kstyle_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kstyle_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kstyle_domino_config_la_LIBADD = $(LIB_KDEUI) ../domino/domino.la $(LIB_QT) $(LIB_KDECORE) -lkdefx $(LIB_KIO) kstyle_domino_config_la_LIBADD = $(LIB_KDEUI) ../domino/libdomino_style.la $(LIB_QT) $(LIB_KDECORE) -lkdefx $(LIB_KIO)
kstyle_domino_config_la_SOURCES = dominoconf.cpp kstyle_domino_config_la_SOURCES = dominoconf.cpp
kstyle_domino_config_la_METASOURCES = AUTO kstyle_domino_config_la_METASOURCES = AUTO

@ -71,9 +71,6 @@ DEALINGS IN THE SOFTWARE.
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include "dominoconf.h" #include "dominoconf.h"
// #include <../domino.h>
#include <../domino/misc.cpp>
#include "configData.h" #include "configData.h"

Loading…
Cancel
Save