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/kdepim@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tags/v3.5.13^0
tpearson 7 years ago
parent
commit
0451bfa1df
42 changed files with 74 additions and 74 deletions
  1. 1
    1
      akregator/src/Makefile.am
  2. 1
    1
      certmanager/Makefile.am
  3. 1
    1
      certmanager/kwatchgnupg/Makefile.am
  4. 1
    1
      kabc/frontend/Makefile.am
  5. 1
    1
      kabc/kabc2mutt/Makefile.am
  6. 1
    1
      kabc/kabcdistlistupdater/Makefile.am
  7. 1
    1
      kaddressbook/Makefile.am
  8. 2
    2
      kalarm/kalarmd/Makefile.am
  9. 2
    2
      kandy/src/Makefile.am
  10. 1
    1
      karm/Makefile.am
  11. 2
    2
      karm/test/Makefile.am
  12. 1
    1
      kitchensync/src/Makefile.am
  13. 1
    1
      kmailcvt/Makefile.am
  14. 2
    2
      kmobile/Makefile.am
  15. 1
    1
      knode/Makefile.am
  16. 1
    1
      knotes/Makefile.am
  17. 1
    1
      kode/Makefile.am
  18. 1
    1
      kode/kwsdl/Makefile.am
  19. 1
    1
      kode/kwsdl/kung/Makefile.am
  20. 1
    1
      kode/kwsdl/schema/Makefile.am
  21. 1
    1
      kode/kwsdl/tests/google/Makefile.am
  22. 1
    1
      kode/kwsdl/wscl/Makefile.am
  23. 1
    1
      kode/kxml_compiler/Makefile.am
  24. 1
    1
      konsolekalendar/Makefile.am
  25. 1
    1
      kontact/src/Makefile.am
  26. 3
    3
      korganizer/Makefile.am
  27. 2
    2
      korganizer/korgac/Makefile.am
  28. 1
    1
      korn/Makefile.am
  29. 1
    1
      korn/kconf_update/Makefile.am
  30. 2
    2
      kresources/featureplan/Makefile.am
  31. 1
    1
      kresources/groupwise/soap/Makefile.am
  32. 1
    1
      kresources/scalix/scalixadmin/Makefile.am
  33. 1
    1
      kresources/slox/Makefile.am
  34. 1
    1
      ktnef/gui/Makefile.am
  35. 1
    1
      ktnef/tests/Makefile.am
  36. 2
    2
      libemailfunctions/tests/Makefile.am
  37. 14
    14
      libkcal/tests/Makefile.am
  38. 2
    2
      libkdepim/cfgc/Makefile.am
  39. 3
    3
      libkdepim/komposer/core/tests/Makefile.am
  40. 1
    1
      libkdepim/komposer/test/Makefile.am
  41. 2
    2
      libkdepim/tests/Makefile.am
  42. 7
    7
      wizards/Makefile.am

+ 1
- 1
akregator/src/Makefile.am View File

@@ -20,7 +20,7 @@ bin_PROGRAMS = akregator
20 20
 
21 21
 # the application source, library search path, and link libraries
22 22
 akregator_SOURCES = main.cpp mainwindow.cpp
23
-akregator_LDFLAGS = $(KDE_RPATH) $(all_libraries)
23
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
24 24
 akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
25 25
 #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libkdepim/libkdepim.la
26 26
 

+ 1
- 1
certmanager/Makefile.am View File

@@ -17,7 +17,7 @@ kleopatra_SOURCES = \
17 17
 
18 18
 METASOURCES = AUTO
19 19
 
20
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH)
20
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21 21
 kleopatra_LDADD   = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
22 22
 
23 23
 rcdir = $(kde_datadir)/kleopatra

+ 1
- 1
certmanager/kwatchgnupg/Makefile.am View File

@@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
13 13
 
14 14
 METASOURCES = AUTO
15 15
 
16
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
16
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
17 17
 kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
18 18
 
19 19
 rcdir = $(kde_datadir)/kwatchgnupg

+ 1
- 1
kabc/frontend/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 
5 5
 bin_PROGRAMS = kabcfrontend
6 6
 
7
-kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH)
7
+kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
9 9
 kabcfrontend_SOURCES = main.cpp mainWindow.ui
10 10
 

+ 1
- 1
kabc/kabc2mutt/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 
5 5
 bin_PROGRAMS = kabc2mutt
6 6
 
7
-kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
7
+kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 kabc2mutt_LDADD = -lkabc $(LIB_KDECORE)
9 9
 kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
10 10
 

+ 1
- 1
kabc/kabcdistlistupdater/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 
5 5
 bin_PROGRAMS = kabcdistlistupdater
6 6
 
7
-kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH)
7
+kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la
9 9
 kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
10 10
 

+ 1
- 1
kaddressbook/Makefile.am View File

@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
17 17
 bin_PROGRAMS = kaddressbook
18 18
 
19 19
 kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
20
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH)
20
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21 21
 kaddressbook_LDADD = libkaddressbook.la
22 22
 
23 23
 kde_module_LTLIBRARIES = libkaddressbookpart.la

+ 2
- 2
kalarm/kalarmd/Makefile.am View File

@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
2 2
 
3 3
 noinst_LTLIBRARIES = libkalarmd.la
4 4
 
5
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
5
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6 6
 libkalarmd_la_LIBADD  = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
7 7
 libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub
8 8
 
9 9
 bin_PROGRAMS = kalarmd
10 10
 
11
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
11
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
12 12
 kalarmd_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
13 13
 kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
14 14
         adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

+ 2
- 2
kandy/src/Makefile.am View File

@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
2 2
 
3 3
 INCLUDES = -I$(top_srcdir) $(all_includes)
4 4
 
5
-kandy_LDFLAGS = $(KDE_RPATH) $(all_libraries)
5
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6 6
 kandy_LDADD   = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libkdepim/libkdepim.la
7 7
 kandy_SOURCES =	main.cpp kandy.cpp \
8 8
                 cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -17,7 +17,7 @@ kandy_SOURCES =	main.cpp kandy.cpp \
17 17
 noinst_HEADERS   = kandy.h kandyview.h modem.h atcommand.h \
18 18
                    commanditem.h mobilegui.h commandscheduler.h
19 19
 
20
-kandy_client_LDFLAGS = $(KDE_RPATH) $(all_libraries)
20
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21 21
 kandy_client_LDADD   = $(LIB_KDECORE)
22 22
 kandy_client_SOURCES = kandy_client.cpp
23 23
 

+ 1
- 1
karm/Makefile.am View File

@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
23 23
              $(top_builddir)/libkdepim/libkdepim.la $(LIBXSS) -lkdeprint 
24 24
 karm_SOURCES = main.cpp
25 25
 karm_LDADD = libkarm_shared.la 
26
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH)
26
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
27 27
 noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
28 28
                  idletimedetector.h kaccelmenuwatch.h timekard.h \
29 29
 		 karmutility.h ktimewidget.h karmstorage.h mainwindow.h \

+ 2
- 2
karm/test/Makefile.am View File

@@ -3,11 +3,11 @@ METASOURCES = AUTO
3 3
 check_PROGRAMS = runscripts locking
4 4
 
5 5
 runscripts_SOURCES = script.cpp runscripts.cpp
6
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH)
6
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7 7
 runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE)
8 8
 
9 9
 locking_SOURCES = locking.cpp lockerthread.cpp
10
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH)
10
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
11 11
 locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
12 12
 
13 13
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)

+ 1
- 1
kitchensync/src/Makefile.am View File

@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
10 10
 bin_PROGRAMS = kitchensync
11 11
 
12 12
 kitchensync_SOURCES = main.cpp mainwindow.cpp
13
-kitchensync_LDFLAGS = $(KDE_RPATH) $(all_libraries)
13
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
14 14
 kitchensync_LDADD = libkitchensync.la
15 15
 
16 16
 xdg_apps_DATA = kitchensync.desktop

+ 1
- 1
kmailcvt/Makefile.am View File

@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
40 40
 kmailcvt_METASOURCES = AUTO
41 41
 
42 42
 # the library search path. 
43
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
43
+kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
44 44
 
45 45
 KDE_ICON=AUTO
46 46
 

+ 2
- 2
kmobile/Makefile.am View File

@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
8 8
 
9 9
 INCLUDES         = $(all_includes)
10 10
 
11
-kmobile_LDFLAGS = $(KDE_RPATH) $(all_libraries)
11
+kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
12 12
 kmobile_LDADD   = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
13 13
 kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
14 14
 			pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
29 29
 libkmobileclient_la_LIBADD = $(LIB_KDECORE) -lDCOP
30 30
 
31 31
 EXTRA_PROGRAMS = testlibkmobile
32
-testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH)
32
+testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
33 33
 testlibkmobile_LDADD = libkmobileclient.la
34 34
 testlibkmobile_SOURCES = testlibkmobile.cpp
35 35
 

+ 1
- 1
knode/Makefile.am View File

@@ -17,7 +17,7 @@ SUBDIRS = pics filters
17 17
 
18 18
 bin_PROGRAMS = knode
19 19
 
20
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH)
20
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21 21
 knode_LDADD   = libknodecommon.la
22 22
 
23 23
 kcm_knode_la_SOURCES = knconfigpages.cpp

+ 1
- 1
knotes/Makefile.am View File

@@ -28,7 +28,7 @@ knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
28 28
 knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
29 29
                   libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
30 30
                   $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils
31
-knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
31
+knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
32 32
 knotes_COMPILE_FIRST = knoteconfig.h
33 33
 
34 34
 kde_module_LTLIBRARIES  = knotes_local.la

+ 1
- 1
kode/Makefile.am View File

@@ -14,7 +14,7 @@ libkode_la_LIBADD = -lkdecore
14 14
 
15 15
 bin_PROGRAMS = kode
16 16
 
17
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH)
17
+kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
18 18
 kode_LDADD   = libkode.la -lkabc
19 19
 kode_SOURCES = kodemain.cpp
20 20
 

+ 1
- 1
kode/kwsdl/Makefile.am View File

@@ -11,7 +11,7 @@ libwsdl_la_LIBADD =  -lkdecore schema/libschema.la
11 11
 
12 12
 bin_PROGRAMS = kwsdl_compiler
13 13
 
14
-kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
14
+kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
15 15
 kwsdl_compiler_LDADD   = ../libkode.la libwsdl.la
16 16
 kwsdl_compiler_SOURCES =  compiler.cpp converter.cpp creator.cpp main.cpp  \
17 17
                           namemapper.cpp 

+ 1
- 1
kode/kwsdl/kung/Makefile.am View File

@@ -1,7 +1,7 @@
1 1
 INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libkdepim $(all_includes)
2 2
 
3 3
 bin_PROGRAMS = kung
4
-kung_LDFLAGS = $(all_libraries) $(KDE_RPATH)
4
+kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
5 5
 kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
6 6
                doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
7 7
                inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \

+ 1
- 1
kode/kwsdl/schema/Makefile.am View File

@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
8 8
 libschema_la_LIBADD = -lqt-mt -lkdecore -lkio
9 9
 
10 10
 #bin_PROGRAMS = schematest
11
-#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
11
+#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
12 12
 #schematest_SOURCES = main.cpp
13 13
 #schematest_LDADD = libschema.la
14 14
 

+ 1
- 1
kode/kwsdl/tests/google/Makefile.am View File

@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
5 5
 
6 6
 googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
7 7
 googletest_LDADD = -lkdecore -lkio
8
-googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
8
+googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
9 9
 

+ 1
- 1
kode/kwsdl/wscl/Makefile.am View File

@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
7 7
 libwscl_la_LIBADD = -lqt-mt
8 8
 
9 9
 #bin_PROGRAMS = wscltest
10
-#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
10
+#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
11 11
 #wscltest_SOURCES = main.cpp
12 12
 #wscltest_LDADD = libwscl.la
13 13
 

+ 1
- 1
kode/kxml_compiler/Makefile.am View File

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
2 2
 
3 3
 bin_PROGRAMS = kxml_compiler
4 4
 
5
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
5
+kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6 6
 kxml_compiler_LDADD   = ../libkode.la -lkdecore
7 7
 kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
8 8
 

+ 1
- 1
konsolekalendar/Makefile.am View File

@@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
13 13
   konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
14 14
   stdcalendar.cpp main.cpp 
15 15
 konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
16
-konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
16
+konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
17 17
 
18 18
 appsdir = $(kde_appsdir)/Utilities
19 19
 xdg_apps_DATA = konsolekalendar.desktop

+ 1
- 1
kontact/src/Makefile.am View File

@@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc
10 10
 bin_PROGRAMS = kontact
11 11
 
12 12
 kontact_METASOURCES = AUTO
13
-kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH)
13
+kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
14 14
 kontact_LDADD = $(top_builddir)/libkdepim/libkdepim.la \
15 15
   $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
16 16
   $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)

+ 3
- 3
korganizer/Makefile.am View File

@@ -14,7 +14,7 @@ INCLUDES = \
14 14
 
15 15
 bin_PROGRAMS = korganizer
16 16
 
17
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
17
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
18 18
 korganizer_LDADD   = libkorganizer.la
19 19
 korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
20 20
 korganizer_COMPILE_FIRST = koprefs_base.h
@@ -36,12 +36,12 @@ libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
36 36
 
37 37
 check_PROGRAMS = korgplugins timezone
38 38
 
39
-korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH)
39
+korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
40 40
 korgplugins_LDADD   = libkorganizer.la $(LIB_KSYCOCA)
41 41
 korgplugins_SOURCES = korgplugins.cpp
42 42
 korgplugins_COMPILE_FIRST = koprefs_base.h
43 43
 
44
-timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH)
44
+timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
45 45
 timezone_LDADD   = libkorganizer.la $(LIB_KSYCOCA)
46 46
 timezone_SOURCES = timezone.cpp
47 47
 timezone_COMPILE_FIRST = koprefs_base.h

+ 2
- 2
korganizer/korgac/Makefile.am View File

@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
2 2
 
3 3
 bin_PROGRAMS = korgac
4 4
 
5
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH)
5
+korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6 6
 korgac_LDADD   = $(LIB_KDEUI) \
7 7
                  $(top_builddir)/korganizer/libkorganizer_eventviewer.la
8 8
 korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
11 11
 
12 12
 check_PROGRAMS = testalarmdlg
13 13
 
14
-testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
14
+testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
15 15
 testalarmdlg_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la \
16 16
                      $(top_builddir)/korganizer/libkorganizer_eventviewer.la
17 17
 testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp

+ 1
- 1
korn/Makefile.am View File

@@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI)
3 3
 INCLUDES = -I$(top_srcdir)/libkmime \
4 4
   	$(all_includes)
5 5
 #INCLUDES = -I$(top_srcdir)/mimelib -I$(top_srcdir)/libkmime $(all_includes)
6
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
6
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7 7
 
8 8
 METASOURCES = AUTO
9 9
 

+ 1
- 1
korn/kconf_update/Makefile.am View File

@@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change
8 8
 kconfdir = $(libdir)/kconf_update_bin
9 9
 
10 10
 korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp
11
-korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH)
11
+korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
12 12
 korn_3_4_config_change_LDADD = $(LIB_QT)

+ 2
- 2
kresources/featureplan/Makefile.am View File

@@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
28 28
 
29 29
 check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
30 30
 
31
-dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
31
+dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
32 32
 dumpfeaturelist_LDADD   = libfeatureplancommon.la $(LIB_KDECORE)
33 33
 dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
34 34
 dumpfeaturelist_COMPILE_FIRST = kde-features.h
35 35
 
36
-benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
36
+benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
37 37
 benchmarkfeaturelist_LDADD   = libfeatureplancommon.la $(LIB_KDECORE)
38 38
 benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
39 39
 benchmarkfeaturelist_COMPILE_FIRST = kde-features.h

+ 1
- 1
kresources/groupwise/soap/Makefile.am View File

@@ -5,7 +5,7 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
5 5
 
6 6
 check_PROGRAMS = soapdebug
7 7
 
8
-soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH)
8
+soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
9 9
 soapdebug_LDADD   = libgwsoap.la -lkdecore \
10 10
                    $(top_builddir)/libkcal/libkcal.la \
11 11
                    $(top_builddir)/libkdepim/libkdepim.la

+ 1
- 1
kresources/scalix/scalixadmin/Makefile.am View File

@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
2 2
 
3 3
 INCLUDES = $(all_includes)
4 4
 
5
-scalixadmin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
5
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6 6
 scalixadmin_LDADD   = $(LIB_KABC)
7 7
 scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
8 8
                       otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \

+ 1
- 1
kresources/slox/Makefile.am View File

@@ -34,7 +34,7 @@ kabc_slox_la_LIBADD  = libkabc_slox.la
34 34
 
35 35
 EXTRA_PROGRAMS = testsloxaccounts
36 36
 
37
-testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH)
37
+testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
38 38
 testsloxaccounts_LDADD = libkslox.la
39 39
 testsloxaccounts_SOURCES = testsloxaccounts.cpp
40 40
 

+ 1
- 1
ktnef/gui/Makefile.am View File

@@ -4,7 +4,7 @@ SUBDIRS = pics
4 4
 
5 5
 bin_PROGRAMS = ktnef
6 6
 
7
-ktnef_LDFLAGS = $(KDE_RPATH) $(all_libraries)
7
+ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 ktnef_LDADD   = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
9 9
 ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
10 10
                 attachpropertydialog.cpp messagepropertydialog.cpp \

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

@@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_KDECORE)
4 4
 check_PROGRAMS = parsertest
5 5
 TESTS = parsertest
6 6
 
7
-parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
7
+parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 parsertest_SOURCES = parsertest.cpp
9 9
 
10 10
 METASOURCES = AUTO

+ 2
- 2
libemailfunctions/tests/Makefile.am View File

@@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE)
4 4
 check_PROGRAMS = testidmapper testemail
5 5
 TESTS = testemail
6 6
 
7
-testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
7
+testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8 8
 testidmapper_SOURCES = testidmapper.cpp
9 9
 
10
-testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
10
+testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
11 11
 testemail_SOURCES = testemail.cpp
12 12
 
13 13
 METASOURCES = AUTO

+ 14
- 14
libkcal/tests/Makefile.am View File

@@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \
25 25
 METASOURCES = AUTO
26 26
 
27 27
 testincidence_SOURCES = testincidence.cpp
28
-testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH)
28
+testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
29 29
 testincidence_LDADD = ../libkcal.la
30 30
 
31 31
 testcalendar_SOURCES = testcalendar.cpp
32
-testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
32
+testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
33 33
 testcalendar_LDADD = ../libkcal.la
34 34
 
35 35
 testtostring_SOURCES = testtostring.cpp
36
-testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH)
36
+testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
37 37
 testtostring_LDADD = ../libkcal.la
38 38
 
39 39
 fbrecurring_SOURCES = fbrecurring.cpp
40
-fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH)
40
+fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
41 41
 fbrecurring_LDADD = ../libkcal.la
42 42
 
43 43
 readandwrite_SOURCES = readandwrite.cpp
44
-readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
44
+readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
45 45
 readandwrite_LDADD = ../libkcal.la
46 46
 
47 47
 testresource_SOURCES = testresource.cpp
48
-testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH)
48
+testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
49 49
 testresource_LDADD = ../libkcal.la
50 50
 
51 51
 testrecurrence_SOURCES = testrecurrence.cpp
52
-testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH)
52
+testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
53 53
 testrecurrence_LDADD = ../libkcal.la
54 54
 
55 55
 testrecurprevious_SOURCES = testrecurprevious.cpp
56
-testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH)
56
+testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
57 57
 testrecurprevious_LDADD = ../libkcal.la
58 58
 
59 59
 testrecurson_SOURCES = testrecurson.cpp
60
-testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH)
60
+testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
61 61
 testrecurson_LDADD = ../libkcal.la
62 62
 
63 63
 testrecurrencetype_SOURCES = testrecurrencetype.cpp
64
-testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH)
64
+testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
65 65
 testrecurrencetype_LDADD = ../libkcal.la
66 66
 
67 67
 testvcalexport_SOURCES = testvcalexport.cpp
68
-testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH)
68
+testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
69 69
 testvcalexport_LDADD = ../libkcal.la
70 70
 
71 71
 testfields_SOURCES = testfields.cpp
72
-testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH)
72
+testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
73 73
 testfields_LDADD   = ../libkcal.la
74 74
 testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"'
75 75
 
76 76
 testfb_SOURCES = testfb.cpp
77
-testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
77
+testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
78 78
 testfb_LDADD = ../libkcal.la
79 79
 
80 80
 testcalselectdialog_SOURCES = testcalselectdialog.cpp
81
-testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH)
81
+testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
82 82
 testcalselectdialog_LDADD = ../libkcal.la
83 83
 
84 84
 TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics

+ 2
- 2
libkdepim/cfgc/Makefile.am View File

@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir) $(all_includes)
3 3
 check_PROGRAMS = example
4 4
 #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 = ../libkdepim.la $(LIB_KDECORE)
8 8
 example_SOURCES = example.cpp exampleprefs_base.kcfgc
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 = ../libkdepim.la $(LIB_KDECORE)
12 12
 #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp
13 13
 

+ 3
- 3
libkdepim/komposer/core/tests/Makefile.am View File

@@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
5 5
 METASOURCES = AUTO
6 6
 
7 7
 testfactory_SOURCES = main.cpp managertest.cpp
8
-testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH)
8
+testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
9 9
 testfactory_LDADD = ../libkomposer.la
10 10
 
11 11
 testmanager_SOURCES = testmanager.cpp
12
-testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH)
12
+testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
13 13
 testmanager_LDADD = ../libkomposer.la
14 14
 
15 15
 testkomposer_SOURCES = testkomposer.cpp
16
-testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
16
+testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
17 17
 testkomposer_LDADD = ../libkomposer.la
18 18
 
19 19
 check: testfactory

+ 1
- 1
libkdepim/komposer/test/Makefile.am View File

@@ -1,6 +1,6 @@
1 1
 AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
2 2
 LDADD = $(LIB_KPARTS) ../core/libkomposer.la
3
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
3
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
4 4
 
5 5
 check_PROGRAMS = test
6 6
 

+ 2
- 2
libkdepim/tests/Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim -I$(top_srcdir)/libemailfunctions $(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
 LDADD = ../libkdepim.la $(LIB_KDECORE)
4 4
 
5 5
 check_PROGRAMS = testwizard testaddresseelineedit \
@@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
29 29
 
30 30
 METASOURCES = AUTO
31 31
 
32
-#example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
32
+#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
33 33
 #example_LDADD = ../libkdepim.la $(LIB_KDECORE)
34 34
 #example_SOURCES = example.cpp exampleprefs_base.kcfgc
35 35
 

+ 7
- 7
wizards/Makefile.am View File

@@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
19 19
                          libscalixwizard.la
20 20
 
21 21
 
22
-groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
22
+groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
23 23
 groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \
24 24
                         libkolabwizard.la \
25 25
                         libexchangewizard.la \
@@ -39,7 +39,7 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \
39 39
   kolabkmailchanges.cpp
40 40
 
41 41
 kolabwizard_LDADD = libkolabwizard.la $(LIB_KDEUI)
42
-kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
42
+kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
43 43
 kolabwizard_SOURCES = kolabmain.cpp
44 44
 
45 45
 # eGroupware
@@ -53,7 +53,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xm
53 53
                                 $(LIB_KDEUI)
54 54
 
55 55
 egroupwarewizard_LDADD = libegroupwarewizard.la
56
-egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
56
+egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
57 57
 egroupwarewizard_SOURCES = egroupwaremain.cpp
58 58
 
59 59
 # SLOX
@@ -64,7 +64,7 @@ libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \
64 64
                           $(top_builddir)/libkdepim/libkdepim.la
65 65
 
66 66
 sloxwizard_LDADD = libsloxwizard.la
67
-sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
67
+sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
68 68
 sloxwizard_SOURCES = sloxmain.cpp
69 69
 
70 70
 # GroupWise
@@ -80,7 +80,7 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_
80 80
 
81 81
 
82 82
 groupwisewizard_LDADD = libgroupwisewizard.la
83
-groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
83
+groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
84 84
 groupwisewizard_SOURCES = groupwisemain.cpp
85 85
 
86 86
 # Exchange
@@ -91,7 +91,7 @@ libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_new
91 91
                               $(top_builddir)/libkdepim/libkdepim.la
92 92
 
93 93
 exchangewizard_LDADD = libexchangewizard.la
94
-exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
94
+exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
95 95
 exchangewizard_SOURCES = exchangemain.cpp
96 96
 
97 97
 # Scalix
@@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg
106 106
   scalixkmailchanges.cpp
107 107
 
108 108
 scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI)
109
-scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
109
+scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
110 110
 scalixwizard_SOURCES = scalixmain.cpp
111 111
 
112 112
 noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \

Loading…
Cancel
Save