Browse Source

Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
80f78d20c3

+ 1
- 1
arts/knotify/Makefile.am View File

@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
15 15
 check_PROGRAMS		= knotifytest
16 16
 knotifytest_SOURCES	= knotifytest.cpp
17 17
 knotifytest_LDADD	= $(LIB_KDECORE)
18
-knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH)
18
+knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
19 19
 
20 20
 noinst_HEADERS	=  knotify.h
21 21
 

+ 3
- 3
dcop/Makefile.am View File

@@ -50,15 +50,15 @@ dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
50 50
 
51 51
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
52 52
 
53
-testdcop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
53
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
54 54
 testdcop_SOURCES = testdcop.cpp
55 55
 testdcop_LDADD = libDCOP.la
56 56
 
57
-dcop_deadlock_test_LDFLAGS = $(KDE_RPATH) $(all_libraries)
57
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
58 58
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
59 59
 dcop_deadlock_test_LDADD = ../kdecore/libkdecore.la
60 60
 
61
-testdcopc_LDFLAGS = $(KDE_RPATH) $(all_libraries)
61
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
62 62
 testdcopc_SOURCES = testdcopc.c dcopc.c
63 63
 testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
64 64
 

+ 1
- 1
interfaces/kscript/Makefile.am View File

@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_
5 5
 #lib_LTLIBRARIES = libkscriptloader.la libkscript.la
6 6
 lib_LTLIBRARIES = libkscript.la
7 7
 #libkscriptloader_la_SOURCES = scriptloader.cpp
8
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
8
+#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
9 9
 #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
10 10
 
11 11
 libkscript_la_SOURCES = scriptmanager.cpp

+ 1
- 1
interfaces/ktexteditor/Makefile.am View File

@@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
22 22
     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
23 23
 
24 24
 
25
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
25
+libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
26 26
 libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
27 27
 
28 28
 ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \

+ 1
- 1
kabc/Makefile.am View File

@@ -52,7 +52,7 @@ METASOURCES = AUTO
52 52
 
53 53
 bin_PROGRAMS = kab2kabc
54 54
 
55
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
55
+kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
56 56
 kab2kabc_LDADD = libkabc.la ../kab/libkab.la
57 57
 kab2kabc_SOURCES = kab2kabc.cpp
58 58
 

+ 12
- 12
kabc/tests/Makefile.am View File

@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
12 12
 testlock_LDFLAGS = $(all_libraries)
13 13
 testlock_SOURCES = testlock.cpp
14 14
 
15
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH)
15
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
16 16
 testldapclient_SOURCES = testldapclient.cpp
17 17
 
18 18
 EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
19 19
   testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
20 20
 
21
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
21
+testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
22 22
 testkabc_SOURCES = testkabc.cpp
23 23
 
24
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH)
24
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
25 25
 testaddressee_SOURCES = testaddressee.cpp
26 26
 
27
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
27
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
28 28
 testaddresseelist_SOURCES = testaddresseelist.cpp
29 29
 
30
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
30
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
31 31
 testaddressfmt_SOURCES = testaddressfmt.cpp
32 32
 
33
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
33
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
34 34
 testkabcdlg_SOURCES = testkabcdlg.cpp
35 35
 
36
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
36
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
37 37
 testdistlist_SOURCES = testdistlist.cpp
38 38
 
39
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
39
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
40 40
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
41 41
 
42
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH)
42
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
43 43
 bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
44 44
 bigread_SOURCES = bigread.cpp
45 45
 
46
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
46
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
47 47
 bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
48 48
 bigwrite_SOURCES = bigwrite.cpp
49 49
 
50
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
50
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
51 51
 testdb_SOURCES = testdb.cpp
52 52
 
53
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
53
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
54 54
 kabcargl_SOURCES = kabcargl.cpp
55 55
 

+ 2
- 2
kabc/vcard/Makefile.am View File

@@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
12 12
 
13 13
 check_PROGRAMS = testwrite testread
14 14
 
15
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
15
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
16 16
 testwrite_LDADD = libvcard.la 
17 17
 testwrite_SOURCES = testwrite.cpp
18 18
 
19
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH)
19
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
20 20
 testread_LDADD = libvcard.la 
21 21
 testread_SOURCES = testread.cpp

+ 3
- 3
kabc/vcardparser/Makefile.am View File

@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
8 8
 
9 9
 check_PROGRAMS = testread testwrite testread2
10 10
 
11
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH)
11
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
12 12
 testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
13 13
 testread_SOURCES = testread.cpp
14 14
 
15
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH)
15
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
16 16
 testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
17 17
 testread2_SOURCES = testread2.cpp testutils.cpp
18 18
 
19
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
19
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
20 20
 testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
21 21
 testwrite_SOURCES = testwrite.cpp
22 22
 

+ 1
- 1
kdecore/kconfig_compiler/Makefile.am View File

@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
4 4
 
5 5
 bin_PROGRAMS = kconfig_compiler
6 6
 
7
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
7
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 kconfig_compiler_LDADD = $(LIB_KDECORE)
9 9
 kconfig_compiler_SOURCES = kconfig_compiler.cpp
10 10
 

+ 2
- 2
kdecore/kconfig_compiler/example/Makefile.am View File

@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
3 3
 check_PROGRAMS = example # autoexample
4 4
 EXTRA_PROGRAMS = autoexample
5 5
 
6
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
6
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7 7
 example_LDADD = $(LIB_KDECORE)
8 8
 example_SOURCES = example.cpp exampleprefs_base.cpp
9 9
 
10
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH)
10
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
11 11
 autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
12 12
 autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
13 13
   autoexample.cpp  

+ 10
- 10
kdecore/kconfig_compiler/tests/Makefile.am View File

@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
14 14
 						 test_dpointer.cpp test_dpointer.h \
15 15
              md5sums
16 16
 
17
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH)
17
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
18 18
 test1_LDADD = $(LIB_KDECORE)
19 19
 test1_SOURCES = test1main.cpp test1.cpp
20 20
 
21
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH)
21
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
22 22
 test2_LDADD = $(LIB_KDECORE)
23 23
 test2_SOURCES = test2main.cpp test2.cpp
24 24
 
25
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH)
25
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
26 26
 test3_LDADD = $(LIB_KDECORE)
27 27
 test3_SOURCES = test3main.cpp test3.cpp
28 28
 
29
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH)
29
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
30 30
 test4_LDADD = $(LIB_KDECORE)
31 31
 test4_SOURCES = test4main.cpp test4.cpp
32 32
 
33
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH)
33
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
34 34
 test5_LDADD = $(LIB_KDECORE)
35 35
 test5_SOURCES = test5main.cpp test5.cpp
36 36
 
37
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH)
37
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
38 38
 test6_LDADD = $(LIB_KDECORE)
39 39
 test6_SOURCES = test6main.cpp test6.cpp
40 40
 
41
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH)
41
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
42 42
 test7_LDADD = $(LIB_KDECORE)
43 43
 test7_SOURCES = test7main.cpp test7.cpp
44 44
 
45
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH)
45
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
46 46
 test8_LDADD = $(LIB_KDECORE)
47 47
 test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
48 48
 
49
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH)
49
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
50 50
 test9_LDADD = $(LIB_KDECORE)
51 51
 test9_SOURCES = test9main.cpp test9.cpp
52 52
 
53
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
53
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
54 54
 test_dpointer_LDADD = $(LIB_KDECORE)
55 55
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
56 56
 

+ 3
- 3
kded/Makefile.am View File

@@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
38 38
 
39 39
 bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
40 40
 
41
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
41
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
42 42
 kdontchangethehostname_LDADD = $(LIB_KDECORE) 
43 43
 kdontchangethehostname_SOURCES = khostname.cpp
44 44
 
45
-kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
45
+kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
46 46
 kmimelist_LDADD = ../kio/libkio.la
47 47
 kmimelist_SOURCES = kmimelist.cpp
48 48
 
49
-kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH)
49
+kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
50 50
 kde_menu_LDADD = $(LIB_KIO)
51 51
 kde_menu_SOURCES = kde-menu.cpp
52 52
 

+ 1
- 1
kdewidgets/Makefile.am View File

@@ -25,7 +25,7 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
25 25
 
26 26
 bin_PROGRAMS = makekdewidgets
27 27
 makekdewidgets_SOURCES = makekdewidgets.cpp
28
-makekdewidgets_LDFLAGS = $(KDE_RPATH) $(all_libraries)
28
+makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
29 29
 makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libkdecore.la 
30 30
 
31 31
 kde_widget_LTLIBRARIES = kdewidgets.la

+ 1
- 1
kio/kioexec/Makefile.am View File

@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
3 3
 bin_PROGRAMS = kioexec
4 4
 
5 5
 kioexec_SOURCES = main.cpp
6
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH)
6
+kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7 7
 kioexec_LDADD   = $(LIB_KIO)
8 8
 
9 9
 noinst_HEADERS = main.h

+ 2
- 2
kio/misc/Makefile.am View File

@@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
38 38
 
39 39
 kmailservice_SOURCES = kmailservice.cpp
40 40
 kmailservice_LDADD = $(LIB_KDECORE)
41
-kmailservice_LDFLAGS = $(KDE_RPATH) $(all_libraries)
41
+kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
42 42
 
43 43
 ktelnetservice_SOURCES = ktelnetservice.cpp
44 44
 ktelnetservice_LDADD = $(LIB_KDEUI)
45
-ktelnetservice_LDFLAGS = $(KDE_RPATH) $(all_libraries)
45
+ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
46 46
 
47 47
 protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
48 48
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol

+ 1
- 1
kio/misc/kfile/Makefile.am View File

@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
5 5
 
6 6
 bin_PROGRAMS = kfile
7 7
 kfile_SOURCES = fileprops.cpp
8
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH)
8
+kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
9 9
 kfile_LDADD = $(LIB_KIO)
10 10
 

+ 1
- 1
kio/misc/ksendbugmail/Makefile.am View File

@@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
20 20
 INCLUDES= -I$(srcdir)/.. $(all_includes)
21 21
 
22 22
 ksendbugmail_SOURCES = main.cpp smtp.cpp
23
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
23
+ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
24 24
 ksendbugmail_LDADD = ../../libkio.la
25 25
 
26 26
 METASOURCES = AUTO

+ 1
- 1
kio/tests/Makefile.am View File

@@ -18,7 +18,7 @@
18 18
 
19 19
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
20 20
 LDADD = $(LIB_KIO)
21
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
21
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
22 22
 
23 23
 check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
24 24
                  kioslavetest kdirwatchtest kshredtest speed kurifiltertest \

+ 1
- 1
kioslave/gzip/Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 INCLUDES = -I$(top_srcdir)/kio $(all_includes)
2
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
2
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
3 3
 METASOURCES = AUTO
4 4
 
5 5
 kde_module_LTLIBRARIES = kgzipfilter.la

+ 1
- 1
kioslave/http/kcookiejar/tests/Makefile.am View File

@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
9 9
 
10 10
 kcookiejartest_SOURCES = kcookiejartest.cpp 
11 11
 kcookiejartest_LDADD   = $(LIB_KIO)
12
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
12
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
13 13
 
14 14
 check-local: kcookiejartest
15 15
 	./kcookiejartest $(srcdir)/cookie.test

+ 1
- 1
kioslave/metainfo/Makefile.am View File

@@ -2,7 +2,7 @@
2 2
 ## Makefile.am of kdebase/kioslave/metainfo
3 3
 
4 4
 INCLUDES = $(all_includes)
5
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
5
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6 6
 METASOURCES = AUTO
7 7
 
8 8
 kde_module_LTLIBRARIES = kio_metainfo.la

+ 3
- 3
knewstuff/Makefile.am View File

@@ -12,17 +12,17 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
12 12
 
13 13
 bin_PROGRAMS = khotnewstuff
14 14
 
15
-khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH)
15
+khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
16 16
 khotnewstuff_LDADD = libknewstuff.la
17 17
 khotnewstuff_SOURCES = khotnewstuff.cpp
18 18
 
19 19
 EXTRA_PROGRAMS = testnewstuff ghns
20 20
 
21
-testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH)
21
+testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
22 22
 testnewstuff_LDADD   = libknewstuff.la
23 23
 testnewstuff_SOURCES = testnewstuff.cpp
24 24
 
25
-ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH)
25
+ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
26 26
 ghns_LDADD   = libknewstuff.la
27 27
 ghns_SOURCES = ghns.cpp
28 28
 

+ 1
- 1
kresources/Makefile.am View File

@@ -37,7 +37,7 @@ kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE
37 37
 
38 38
 check_PROGRAMS = testresources
39 39
 
40
-testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH)
40
+testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
41 41
 testresources_LDADD   = libkresources.la
42 42
 testresources_SOURCES = testresources.cpp
43 43
 

+ 1
- 1
kstyles/keramik/Makefile.am View File

@@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
15 15
 
16 16
 genembed_SOURCES = genembed.cpp
17 17
 genembed_LDADD = ../../kdefx/libkdefx.la
18
-genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH)
18
+genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
19 19
 
20 20
 pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
21 21
 	 pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\

+ 1
- 1
kstyles/utils/installtheme/Makefile.am View File

@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kinstalltheme
10 10
 kinstalltheme_SOURCES = main.cpp 
11 11
 
12 12
 # the library search path. 
13
-kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH)
13
+kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
14 14
 
15 15
 # the libraries to link against. Be aware of the order. First the libraries,
16 16
 # that depend on the following ones.

+ 1
- 1
kunittest/Makefile.am View File

@@ -10,7 +10,7 @@ libkunittestinclude_HEADERS = runner.h tester.h module.h
10 10
 libkunittestincludedir = $(includedir)/kunittest
11 11
 
12 12
 bin_PROGRAMS = kunittestmodrunner
13
-kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH)
13
+kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
14 14
 kunittestmodrunner_LDADD = libkunittest.la $(LIB_KDECORE)
15 15
 kunittestmodrunner_SOURCES = modrunner.cpp
16 16
 

+ 1
- 1
pics/Makefile.am View File

@@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG)
10 10
 
11 11
 ksvgtopng_SOURCES = ksvgtopng.cpp
12 12
 ksvgtopng_LDADD =  $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la
13
-ksvgtopng_LDFLAGS = $(KDE_RPATH) $(all_libraries)
13
+ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
14 14
 
15 15
 install-data-local:
16 16
 	-rm -f $(DESTDIR)$(kde_icondir)/default.kde

Loading…
Cancel
Save