diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-04-06 19:47:55 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-04-06 19:47:55 +0200 |
| commit | 2c9119a5eff2397157a75f13b901e417f9d3bd12 (patch) | |
| tree | b827a8caecbdac199f5cc49808cf27b3759bf5c8 | |
| parent | 1e2161224bce28f05016a51e049137739ab77651 (diff) | |
| download | tde-style-domino-2c9119a5.tar.gz tde-style-domino-2c9119a5.zip | |
Fix FTBFS due to link module to shared library
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | domino/Makefile.am | 4 | ||||
| -rw-r--r-- | dominoConfig/Makefile.am | 2 | ||||
| -rw-r--r-- | dominoConfig/dominoconf.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/domino/Makefile.am b/domino/Makefile.am index 02f1095..fcb61e0 100644 --- a/domino/Makefile.am +++ b/domino/Makefile.am @@ -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_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) diff --git a/dominoConfig/Makefile.am b/dominoConfig/Makefile.am index d2c5ac4..9f7a04f 100644 --- a/dominoConfig/Makefile.am +++ b/dominoConfig/Makefile.am @@ -3,6 +3,6 @@ INCLUDES = $(all_includes) -I/usr/include/freetype2 noinst_HEADERS = dominoconf.h kde_module_LTLIBRARIES = kstyle_domino_config.la 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_METASOURCES = AUTO diff --git a/dominoConfig/dominoconf.cpp b/dominoConfig/dominoconf.cpp index 1984c56..056a745 100644 --- a/dominoConfig/dominoconf.cpp +++ b/dominoConfig/dominoconf.cpp @@ -71,9 +71,6 @@ DEALINGS IN THE SOFTWARE. #include FT_FREETYPE_H #include "dominoconf.h" -// #include <../domino.h> -#include <../domino/misc.cpp> - #include "configData.h" |