diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-17 07:48:22 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-17 07:48:22 +0000 |
| commit | 45ec71460ebc34fbb5dd289f42e4c25a35ff4341 (patch) | |
| tree | 387bf929221aea648503914896c612dcf9d093aa | |
| parent | 516c8c008326bb456dcb58f8fcec1fcddae45b4e (diff) | |
| download | ksquirrel-45ec7146.tar.gz ksquirrel-45ec7146.zip | |
Fix ksquirrel FTBFS under oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ksquirrel@1259280 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | ksquirrel/Makefile.am | 2 | ||||
| -rw-r--r-- | ksquirrel/ksquirrel-libs-configurator/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am index b36985c..4f0eae4 100644 --- a/ksquirrel/Makefile.am +++ b/ksquirrel/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = ksquirrel ## INCLUDES were found outside kdevelop specific part ksquirrel_SOURCES = sq_slideshowwidget.cpp sq_slideshow.ui sq_slideshowlisting.ui fmt_filters.cpp sq_glwidget_stuff.cpp sq_tabopendialog.ui sq_dragprovider.cpp sq_utils_scale.cpp sq_utils.cpp sq_thumbnailsunused.cpp sq_dirthumbs.cpp sq_downloader.cpp sq_glselectionpainter.cpp sq_glwidget.cpp sq_glparts.cpp sq_codecsettings.cpp sq_filedialog.cpp sq_codecsettingsskeleton.ui sq_kipimanager.cpp sq_kipiinterface.cpp sq_progressbox.cpp sq_thumbnailloadjob.cpp sq_splashscreen.cpp sq_popupmenu.cpp sq_glinfo.ui sq_glwidget_helpers.cpp sq_imageloader.cpp sq_pluginsinfo.ui sq_iconloader.cpp sq_selectdeselectgroup.ui sq_thumbnailcachemaster.ui sq_errorstring.cpp sq_navigatordropmenu.cpp sq_fileiconviewbase.cpp sq_helpwidget.ui sq_glview.cpp sq_viewcache.ui sq_filethumbviewitem.cpp sq_progress.cpp sq_thumbnailsize.cpp sq_pixmapcache.cpp sq_filethumbview.cpp sq_dir.cpp sq_iconlistbox.cpp sq_iconlistitem.cpp sq_widgetstack.cpp sq_options.ui sq_libraryhandler.cpp sq_imageproperties.ui sq_hloptions.cpp sq_glu.cpp sq_filters.ui sq_fileiconview.cpp sq_filedetailview.cpp sq_externaltools.ui sq_externaltool.cpp sq_diroperator.cpp sq_config.cpp sq_bookmarkowner.cpp sq_archivehandler.cpp ksquirrel.cpp main.cpp -ksquirrel_LDADD = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) +ksquirrel_LDADD = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP SUBDIRS = sidebar imageedit mime diff --git a/ksquirrel/ksquirrel-libs-configurator/Makefile.am b/ksquirrel/ksquirrel-libs-configurator/Makefile.am index 8750aff..9da0df2 100644 --- a/ksquirrel/ksquirrel-libs-configurator/Makefile.am +++ b/ksquirrel/ksquirrel-libs-configurator/Makefile.am @@ -4,7 +4,8 @@ bin_PROGRAMS = ksquirrel-libs-configurator-real bin_SCRIPTS = ksquirrel-libs-configurator ksquirrel_libs_configurator_real_SOURCES = main.cpp klc.ui -ksquirrel_libs_configurator_real_LDADD = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +ksquirrel_libs_configurator_real_LDADD = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE) $(LIB_QT) +ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE) $(LIB_QT) AM_CXXFLAGS = $(ksquirrellibs_CFLAGS) |