Browse Source

Fix FTBFS due to link module to shared library

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 3 years ago
parent
commit
2c9119a5ef
3 changed files with 5 additions and 4 deletions
  1. 4
    0
      domino/Makefile.am
  2. 1
    1
      dominoConfig/Makefile.am
  3. 0
    3
      dominoConfig/dominoconf.cpp

+ 4
- 0
domino/Makefile.am View File

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

+ 1
- 1
dominoConfig/Makefile.am View File

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

+ 0
- 3
dominoConfig/dominoconf.cpp View File

@@ -71,9 +71,6 @@ DEALINGS IN THE SOFTWARE.
71 71
 #include FT_FREETYPE_H
72 72
 
73 73
 #include "dominoconf.h"
74
-// #include <../domino.h>
75
-#include <../domino/misc.cpp>
76
-
77 74
 #include "configData.h"
78 75
 
79 76
 

Loading…
Cancel
Save