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 | 8a5dfb29c455d1d7acdcbda03d83bb7f7ca584c4 (patch) | |
| tree | 7417644d0ce6e7337978f08d5254c236785a0733 /kunittest | |
| parent | 227254c159944194a913373a5a6cd34516a33460 (diff) | |
| download | tdesdk-8a5dfb29c455d1d7acdcbda03d83bb7f7ca584c4.tar.gz tdesdk-8a5dfb29c455d1d7acdcbda03d83bb7f7ca584c4.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/kdesdk@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kunittest')
| -rw-r--r-- | kunittest/Makefile.am | 4 | ||||
| -rw-r--r-- | kunittest/example/simple/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am index 2e5d3d0b..d8c0161e 100644 --- a/kunittest/Makefile.am +++ b/kunittest/Makefile.am @@ -4,14 +4,14 @@ METASOURCES = AUTO lib_LTLIBRARIES = libkunittestgui.la libkunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel -libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libkunittestgui_la_LIBADD = -lkunittest $(LIB_KDECORE) runnergui.lo : testerwidget.h bin_PROGRAMS = kunittestguimodrunner kunittestguimodrunner_SOURCES = guimodrunner.cpp -kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_KDECORE) $(LIB_KIO) noinst_HEADERS = dcopinterface.h diff --git a/kunittest/example/simple/Makefile.am b/kunittest/example/simple/Makefile.am index f35b8228..3c88d7fd 100644 --- a/kunittest/example/simple/Makefile.am +++ b/kunittest/example/simple/Makefile.am @@ -4,11 +4,11 @@ METASOURCES = AUTO check_PROGRAMS = sampletests sampletestsgui sampletests_SOURCES = main.cpp sampletest.cpp -sampletests_LDFLAGS = $(KDE_RPATH) $(all_libraries) +sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor sampletests_LDADD = -lkunittest sampletestsgui_SOURCES = maingui.cpp sampletest.cpp -sampletestsgui_LDFLAGS = $(KDE_RPATH) $(all_libraries) +sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # Normally you would write -lkunittestgui here, but since the examples # are bundled with the library source code itself we don't want to # have you install the libraries before you can compile the examples. |