diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
| commit | 3438ddb040dbabb8fcd62def6ad7bef84db0f83e (patch) | |
| tree | 5df9962864de79383719bb769c1d56f122f4e13f | |
| parent | 629a2952f805a94973e4d73e1ffddfb29fc3cf83 (diff) | |
| download | tdeadmin-3438ddb040dbabb8fcd62def6ad7bef84db0f83e.tar.gz tdeadmin-3438ddb040dbabb8fcd62def6ad7bef84db0f83e.zip | |
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/kdeadmin@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kcron/Makefile.am | 2 | ||||
| -rw-r--r-- | kdat/Makefile.am | 2 | ||||
| -rw-r--r-- | ksysv/Makefile.am | 2 | ||||
| -rw-r--r-- | secpolicy/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kcron/Makefile.am b/kcron/Makefile.am index 1cd898d..fafc80e 100644 --- a/kcron/Makefile.am +++ b/kcron/Makefile.am @@ -97,7 +97,7 @@ INCLUDES= $(all_includes) kcron_METASOURCES = AUTO -kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcron.pot diff --git a/kdat/Makefile.am b/kdat/Makefile.am index 846ce4c..3d9a7ff 100644 --- a/kdat/Makefile.am +++ b/kdat/Makefile.am @@ -63,7 +63,7 @@ kdat_SOURCES = \ # the library search path -kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/ksysv/Makefile.am b/ksysv/Makefile.am index 5e8ff78..6f21169 100644 --- a/ksysv/Makefile.am +++ b/ksysv/Makefile.am @@ -38,7 +38,7 @@ ksysv_SOURCES = main.cpp \ # the library search path ksysv_METASOURCES = AUTO -ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) +ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksysv_LDADD = $(LIB_KFILE) -lkdeprint # this option you can leave out. Just, if you use "make dist", you need it diff --git a/secpolicy/Makefile.am b/secpolicy/Makefile.am index 0d221bc..985d173 100644 --- a/secpolicy/Makefile.am +++ b/secpolicy/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = secpolicy secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp secpolicy_LDADD = $(LIB_KIO) -secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) +secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = secpolicywin.h pamview.h ppitem.h |