diff options
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| -rw-r--r-- | config.log | 8 | ||||
| -rw-r--r-- | ksquirrel.kdevprj | 2 | ||||
| -rw-r--r-- | ksquirrel/Makefile.am | 2 | ||||
| -rw-r--r-- | ksquirrel/ksquirrel-libs-configurator/Makefile.am | 4 | ||||
| -rw-r--r-- | ksquirrel/ksquirrelpart/Makefile.am | 2 |
6 files changed, 21 insertions, 21 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8c46af5..485ee0e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2068,8 +2068,8 @@ if test $kde_qtver = 3; then *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") @@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -2099,13 +2099,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -210,11 +210,11 @@ LIBUTIL='' LIBZ='' LIB_KAB='' LIB_KABC='' -LIB_KDECORE='' +LIB_TDECORE='' LIB_KDED='' -LIB_KDEPIM='' -LIB_KDEPRINT='' -LIB_KDEUI='' +LIB_TDEPIM='' +LIB_TDEPRINT='' +LIB_TDEUI='' LIB_KDNSSD='' LIB_KFILE='' LIB_KFM='' diff --git a/ksquirrel.kdevprj b/ksquirrel.kdevprj index 87e2677..c767d71 100644 --- a/ksquirrel.kdevprj +++ b/ksquirrel.kdevprj @@ -22,7 +22,7 @@ bin_program=ksquirrel cflags= cppflags= cxxflags=\s-O2 -Wall -ldadd=$(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +ldadd=$(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s-s \s [General] diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am index d412100..6f5a85b 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) -lDCOP -ltdefx +ksquirrel_LDADD = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx SUBDIRS = sidebar imageedit mime diff --git a/ksquirrel/ksquirrel-libs-configurator/Makefile.am b/ksquirrel/ksquirrel-libs-configurator/Makefile.am index 9da0df2..ec4fc8b 100644 --- a/ksquirrel/ksquirrel-libs-configurator/Makefile.am +++ b/ksquirrel/ksquirrel-libs-configurator/Makefile.am @@ -4,8 +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) -lDCOP $(LIB_KDECORE) $(LIB_QT) -ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE) $(LIB_QT) +ksquirrel_libs_configurator_real_LDADD = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT) +ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT) AM_CXXFLAGS = $(ksquirrellibs_CFLAGS) diff --git a/ksquirrel/ksquirrelpart/Makefile.am b/ksquirrel/ksquirrelpart/Makefile.am index 0223074..919d1f0 100644 --- a/ksquirrel/ksquirrelpart/Makefile.am +++ b/ksquirrel/ksquirrelpart/Makefile.am @@ -14,7 +14,7 @@ AM_CCASFLAGS = -I$(srcdir) $(KSQUIRREL_ASM_DEFS) libksquirrelpart_la_SOURCES = ksquirrelpart.cpp sq_glparts.cpp sq_glu.cpp sq_glwidget.cpp sq_glwidget_stuff.cpp sq_libraryhandler.cpp sq_downloader.cpp sq_iconloader.cpp fmt_filters.cpp sq_externaltool.cpp sq_config.cpp sq_filedialog.cpp sq_imagefilter.ui sq_imagebcg.ui sq_glselectionpainter.cpp sq_glwidget_helpers.cpp sq_label.cpp sq_bcglabel.cpp sq_popupmenu.cpp sq_codecsettingsskeleton.ui sq_codecsettings.cpp sq_imageproperties.ui sq_utils.cpp sq_helpwidget.ui sq_utils_asm_scale.S sq_utils_scale.cpp sq_diroperator.cpp sq_glview.cpp sq_errorstring.cpp libksquirrelpart_la_LIBADD = $(LIB_KPARTS) -libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_KDEPRINT) -lqui -lkonq -ltdefx +libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lqui -lkonq -ltdefx if SQ_HAVE_KEXIF libksquirrelpart_la_LDFLAGS += $(libkexif_LIBS) |