diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-16 07:02:38 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-16 07:02:38 +0000 |
| commit | 56bd9a604f81c219886b73715d8ffa1ee4843246 (patch) | |
| tree | 109bbdc567e2528d7cac8b2915984f8d1a835718 | |
| parent | 5390f60f937ca13fe24640e306bc572d5c182a4d (diff) | |
| download | kmymoney-56bd9a604f81c219886b73715d8ffa1ee4843246.tar.gz kmymoney-56bd9a604f81c219886b73715d8ffa1ee4843246.zip | |
Fix kmymoney2 FTBFS under oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1259117 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kmymoney2/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index ca20182..1e39e16 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp -kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_KUTILS) SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc @@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog METASOURCES = AUTO # the library search path. -kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic +kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE @@ -166,6 +166,6 @@ kmymoneytest_SOURCES = kmymoneytest.cpp kmymoneyutils.cpp kmymoneyglobalsettings kmymoneytest_LDADD = ./mymoney/storage/libstoragetest.a ./mymoney/libmymoneytest.a ./converter/libconvertertest.a ./reports/libreportstest.a $(kmymoney2_LDADD) kmymoneysettings.$(OBJEXT) # the library search path. -kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) +kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) $(LIB_KUTILS) endif |