From f27be165c4bbcc01c6ca4ecca410f68177d117e3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 23 Jan 2026 20:46:26 +0900 Subject: Split kvirc executable into a shared library (libkvirc) and a stub executable (kvirc). Autotool builds kvirc with '-export-dynamic', which exports all global symbols from the main executable to the dynamic symbol table. This allows 'modules' to access those symbols and build successfully. CMake build kvirc without '-export-dynamic' and with hidden symbol visibitily by default, resulting in FTBFS when the build process reaches the 'modules' part. This is caused by the modules referring to symbols define in code under the 'src/kvirc' folder Splitting 'kvirc' into an additional 'libkvirc' shared library plus a simple executable stub that creates the application and run it, allows modules to be linked against the library part and build successfully also with cmake. Signed-off-by: Michele Calgaro --- src/kvirc/build/Makefile.am | 20 +++++++++++--------- src/modules/about/Makefile.am | 2 +- src/modules/action/Makefile.am | 2 +- src/modules/actioneditor/Makefile.am | 2 +- src/modules/addon/Makefile.am | 2 +- src/modules/aliaseditor/Makefile.am | 2 +- src/modules/avatar/Makefile.am | 2 +- src/modules/chan/Makefile.am | 2 +- src/modules/channelsjoin/Makefile.am | 2 +- src/modules/clock/Makefile.am | 2 +- src/modules/codetester/Makefile.am | 2 +- src/modules/config/Makefile.am | 2 +- src/modules/context/Makefile.am | 2 +- src/modules/dcc/Makefile.am | 2 +- src/modules/dialog/Makefile.am | 2 +- src/modules/dockwidget/Makefile.am | 2 +- src/modules/editor/Makefile.am | 2 +- src/modules/eventeditor/Makefile.am | 2 +- src/modules/file/Makefile.am | 2 +- src/modules/filetransferwindow/Makefile.am | 2 +- src/modules/help/Makefile.am | 2 +- src/modules/http/Makefile.am | 2 +- src/modules/ident/Makefile.am | 2 +- src/modules/iograph/Makefile.am | 2 +- src/modules/lamerizer/Makefile.am | 2 +- src/modules/links/Makefile.am | 2 +- src/modules/list/Makefile.am | 2 +- src/modules/log/Makefile.am | 2 +- src/modules/logview/Makefile.am | 2 +- src/modules/mask/Makefile.am | 2 +- src/modules/math/Makefile.am | 2 +- src/modules/mediaplayer/Makefile.am | 2 +- src/modules/mircimport/Makefile.am | 2 +- src/modules/my/Makefile.am | 2 +- src/modules/notifier/Makefile.am | 2 +- src/modules/objects/Makefile.am | 2 +- src/modules/options/Makefile.am | 2 +- src/modules/perl/Makefile.am | 2 +- src/modules/perlcore/Makefile.am | 2 +- src/modules/popupeditor/Makefile.am | 2 +- src/modules/raweditor/Makefile.am | 2 +- src/modules/regchan/Makefile.am | 2 +- src/modules/reguser/Makefile.am | 2 +- src/modules/rijndael/Makefile.am | 2 +- src/modules/setup/Makefile.am | 2 +- src/modules/sharedfile/Makefile.am | 2 +- src/modules/sharedfileswindow/Makefile.am | 2 +- src/modules/snd/Makefile.am | 2 +- src/modules/socketspy/Makefile.am | 2 +- src/modules/spaste/Makefile.am | 2 +- src/modules/str/Makefile.am | 2 +- src/modules/system/Makefile.am | 2 +- src/modules/term/Makefile.am | 2 +- src/modules/texticons/Makefile.am | 2 +- src/modules/theme/Makefile.am | 2 +- src/modules/tip/Makefile.am | 2 +- src/modules/tmphighlight/Makefile.am | 2 +- src/modules/toolbar/Makefile.am | 2 +- src/modules/toolbareditor/Makefile.am | 2 +- src/modules/torrent/Makefile.am | 2 +- src/modules/url/Makefile.am | 2 +- src/modules/window/Makefile.am | 2 +- 62 files changed, 72 insertions(+), 70 deletions(-) diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am index 75ff8bcb..f4b76206 100644 --- a/src/kvirc/build/Makefile.am +++ b/src/kvirc/build/Makefile.am @@ -11,10 +11,13 @@ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/ -I$(SS_TOPSRCDIR)/src/kvirc/ui/ \ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" -kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +lib_LTLIBRARIES = libkvirc.la +libkvirc_la_LDFLAGS = $(SS_LDFLAGS) -version-info 3:0:0 $(SS_LIBDIRS) +libkvirc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la -bin_PROGRAMS = kvirc +bin_PROGRAMS = kvirc +kvirc_LDFLAGS = $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) +kvirc_LDADD = $(SS_LIBLINK) libkvirc.la ../../kvilib/build/libkvilib.la # # Command useful to find out all the sources @@ -22,7 +25,8 @@ bin_PROGRAMS = kvirc # echo $SRC # -kvirc_SOURCES = ../kernel/kvi_action.cpp \ +libkvirc_la_SOURCES = \ +../kernel/kvi_action.cpp \ ../kernel/kvi_actionmanager.cpp \ ../kernel/kvi_app.cpp \ ../kernel/kvi_coreactions.cpp \ @@ -50,7 +54,6 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ ../kernel/kvi_irclink.cpp \ ../kernel/kvi_ircsocket.cpp \ ../kernel/kvi_ircurl.cpp \ -../kernel/kvi_main.cpp \ ../kernel/kvi_lagmeter.cpp \ ../kernel/kvi_notifylist.cpp \ ../kernel/kvi_options.cpp \ @@ -225,6 +228,9 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ ../ui/kvi_userlistview.cpp \ ../ui/kvi_window.cpp +kvirc_SOURCES = \ +../kernel/kvi_main.cpp + # # Command useful to find out all the headers # rm -f ../include/*.h @@ -232,7 +238,6 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ # echo $SRC # - headers_HEADERS = ../kernel/kvi_action.h \ ../kernel/kvi_actionmanager.h \ ../kernel/kvi_app.h \ @@ -422,7 +427,6 @@ headers_HEADERS = ../kernel/kvi_action.h \ ../ui/kvi_styled_controls.h \ ../ui/kvi_toolwindows_container.h - ../kvs/%.moc: ../kvs/%.h $(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@ @@ -517,8 +521,6 @@ headers_HEADERS = ../kernel/kvi_action.h \ ../ui/kvi_userlistview.cpp: ../ui/kvi_userlistview.moc ../ui/kvi_window.cpp: ../ui/kvi_window.moc - - # # All the cpp files depend on symlinks beging up-to-date # diff --git a/src/modules/about/Makefile.am b/src/modules/about/Makefile.am index 4192c119..bc1654d5 100644 --- a/src/modules/about/Makefile.am +++ b/src/modules/about/Makefile.am @@ -11,7 +11,7 @@ libkviabout_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviabout_la_SOURCES = libkviabout.cpp aboutdialog.cpp -libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= aboutdialog.h diff --git a/src/modules/action/Makefile.am b/src/modules/action/Makefile.am index 2015e908..f765fa25 100644 --- a/src/modules/action/Makefile.am +++ b/src/modules/action/Makefile.am @@ -11,7 +11,7 @@ libkviaction_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviaction_la_SOURCES = libkviaction.cpp -libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= actiondialog.h diff --git a/src/modules/actioneditor/Makefile.am b/src/modules/actioneditor/Makefile.am index 84ce9dd7..57291a7d 100644 --- a/src/modules/actioneditor/Makefile.am +++ b/src/modules/actioneditor/Makefile.am @@ -13,7 +13,7 @@ libkviactioneditor_la_SOURCES = libkviactioneditor.cpp actioneditor.cpp nodist_libkviactioneditor_la_SOURCES = moc_actioneditor.cpp noinst_HEADERS = actioneditor.h -libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/addon/Makefile.am b/src/modules/addon/Makefile.am index e232b8ff..c822520f 100644 --- a/src/modules/addon/Makefile.am +++ b/src/modules/addon/Makefile.am @@ -14,7 +14,7 @@ libkviaddon_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviaddon_la_SOURCES = libkviaddon.cpp managementdialog.cpp nodist_libkviaddon_la_SOURCES = moc_managementdialog.cpp -libkviaddon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviaddon_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= managementdialog.h diff --git a/src/modules/aliaseditor/Makefile.am b/src/modules/aliaseditor/Makefile.am index 60845dbc..223b8d5d 100644 --- a/src/modules/aliaseditor/Makefile.am +++ b/src/modules/aliaseditor/Makefile.am @@ -13,7 +13,7 @@ libkvialiaseditor_la_SOURCES = libkvialiaseditor.cpp aliaseditor.cpp nodist_libkvialiaseditor_la_SOURCES = moc_aliaseditor.cpp noinst_HEADERS = aliaseditor.h -libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/avatar/Makefile.am b/src/modules/avatar/Makefile.am index 8e8a793a..bb5050e3 100644 --- a/src/modules/avatar/Makefile.am +++ b/src/modules/avatar/Makefile.am @@ -12,7 +12,7 @@ libkviavatar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviavatar_la_SOURCES = libkviavatar.cpp nodist_libkviavatar_la_SOURCES = moc_libkviavatar.cpp -libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = libkviavatar.h diff --git a/src/modules/chan/Makefile.am b/src/modules/chan/Makefile.am index 620836ac..312f12b1 100644 --- a/src/modules/chan/Makefile.am +++ b/src/modules/chan/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvichan.la libkvichan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvichan_la_SOURCES = libkvichan.cpp -libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/channelsjoin/Makefile.am b/src/modules/channelsjoin/Makefile.am index c9f8a78e..48466890 100644 --- a/src/modules/channelsjoin/Makefile.am +++ b/src/modules/channelsjoin/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvichannelsjoin.la libkvichannelsjoin_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvichannelsjoin_la_SOURCES = libkvichannelsjoin.cpp channelsjoinwindow.cpp -libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= channelsjoinwindow.h diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am index bf0a6816..3ae0d0ba 100644 --- a/src/modules/clock/Makefile.am +++ b/src/modules/clock/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviclock.la libkviclock_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviclock_la_SOURCES = libkviclock.cpp -libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviclock.h diff --git a/src/modules/codetester/Makefile.am b/src/modules/codetester/Makefile.am index 37540094..45afbd4f 100644 --- a/src/modules/codetester/Makefile.am +++ b/src/modules/codetester/Makefile.am @@ -9,7 +9,7 @@ libkvicodetester_la_SOURCES = libkvicodetester.cpp codetester.cpp nodist_libkvicodetester_la_SOURCES = moc_codetester.cpp noinst_HEADERS = codetester.h -libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/config/Makefile.am b/src/modules/config/Makefile.am index 1a43c2e9..78310a2e 100644 --- a/src/modules/config/Makefile.am +++ b/src/modules/config/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviconfig.la libkviconfig_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviconfig_la_SOURCES = libkviconfig.cpp -libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/context/Makefile.am b/src/modules/context/Makefile.am index e4ec3252..a303fc0d 100644 --- a/src/modules/context/Makefile.am +++ b/src/modules/context/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvicontext.la libkvicontext_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvicontext_la_SOURCES = libkvicontext.cpp -libkvicontext_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvicontext_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/dcc/Makefile.am b/src/modules/dcc/Makefile.am index 8a63b888..ef262f8a 100644 --- a/src/modules/dcc/Makefile.am +++ b/src/modules/dcc/Makefile.am @@ -34,7 +34,7 @@ libkvidcc_la_SOURCES = adpcmcodec.cpp \ voice.cpp \ window.cpp -libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= adpcmcodec.h \ broker.h \ diff --git a/src/modules/dialog/Makefile.am b/src/modules/dialog/Makefile.am index 06018a14..4ed9e9fa 100644 --- a/src/modules/dialog/Makefile.am +++ b/src/modules/dialog/Makefile.am @@ -11,7 +11,7 @@ libkvidialog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvidialog_la_SOURCES = libkvidialog.cpp -libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvidialog.h diff --git a/src/modules/dockwidget/Makefile.am b/src/modules/dockwidget/Makefile.am index f0411021..c1c4da56 100644 --- a/src/modules/dockwidget/Makefile.am +++ b/src/modules/dockwidget/Makefile.am @@ -13,7 +13,7 @@ libkvidockwidget_la_SOURCES = libkvidockwidget_qt3.cpp #nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp -libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvidockwidget.h libkvidockwidget_qt3.h diff --git a/src/modules/editor/Makefile.am b/src/modules/editor/Makefile.am index beb22541..11a48111 100644 --- a/src/modules/editor/Makefile.am +++ b/src/modules/editor/Makefile.am @@ -11,7 +11,7 @@ libkvieditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) nodist_libkvieditor_la_SOURCES = moc_scripteditor.cpp libkvieditor_la_SOURCES = libkvieditor.cpp scripteditor.cpp -libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= scripteditor.h diff --git a/src/modules/eventeditor/Makefile.am b/src/modules/eventeditor/Makefile.am index ceb7541a..afb12e43 100644 --- a/src/modules/eventeditor/Makefile.am +++ b/src/modules/eventeditor/Makefile.am @@ -13,7 +13,7 @@ libkvieventeditor_la_SOURCES = libkvieventeditor.cpp eventeditor.cpp nodist_libkvieventeditor_la_SOURCES = moc_eventeditor.cpp noinst_HEADERS = eventeditor.h -libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/file/Makefile.am b/src/modules/file/Makefile.am index 1545a63a..f1b70abd 100644 --- a/src/modules/file/Makefile.am +++ b/src/modules/file/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvifile.la libkvifile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvifile_la_SOURCES = libkvifile.cpp -libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/filetransferwindow/Makefile.am b/src/modules/filetransferwindow/Makefile.am index 910d86b4..372c0f1b 100644 --- a/src/modules/filetransferwindow/Makefile.am +++ b/src/modules/filetransferwindow/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvifiletransferwindow.la libkvifiletransferwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvifiletransferwindow_la_SOURCES = libkvifiletransferwindow.cpp filetransferwindow.cpp -libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= filetransferwindow.h diff --git a/src/modules/help/Makefile.am b/src/modules/help/Makefile.am index fe6f03f6..36e130af 100644 --- a/src/modules/help/Makefile.am +++ b/src/modules/help/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvihelp.la libkvihelp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvihelp_la_SOURCES = libkvihelp.cpp helpwidget.cpp helpwindow.cpp index.cpp index.moc -libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= helpwidget.h helpwindow.h index.h diff --git a/src/modules/http/Makefile.am b/src/modules/http/Makefile.am index ab7fe3b2..728e3235 100644 --- a/src/modules/http/Makefile.am +++ b/src/modules/http/Makefile.am @@ -16,7 +16,7 @@ pluglib_LTLIBRARIES = libkvihttp.la libkvihttp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvihttp_la_SOURCES = libkvihttp.cpp httpfiletransfer.cpp -libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= httpfiletransfer.h diff --git a/src/modules/ident/Makefile.am b/src/modules/ident/Makefile.am index c02c0b47..71bf0e9b 100644 --- a/src/modules/ident/Makefile.am +++ b/src/modules/ident/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviident.la libkviident_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviident_la_SOURCES = libkviident.cpp -libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviident.h diff --git a/src/modules/iograph/Makefile.am b/src/modules/iograph/Makefile.am index a9ea3928..8d10a3cf 100644 --- a/src/modules/iograph/Makefile.am +++ b/src/modules/iograph/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviiograph.la libkviiograph_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviiograph_la_SOURCES = libkviiograph.cpp -libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviiograph.h diff --git a/src/modules/lamerizer/Makefile.am b/src/modules/lamerizer/Makefile.am index ce798e5c..164a6523 100644 --- a/src/modules/lamerizer/Makefile.am +++ b/src/modules/lamerizer/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilamerizer.la libkvilamerizer_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilamerizer_la_SOURCES = libkvilamerizer.cpp -libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvilamerizer.h diff --git a/src/modules/links/Makefile.am b/src/modules/links/Makefile.am index 51eea094..9ca4c085 100644 --- a/src/modules/links/Makefile.am +++ b/src/modules/links/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilinks.la libkvilinks_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilinks_la_SOURCES = libkvilinks.cpp linkswindow.cpp -libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= linkswindow.h diff --git a/src/modules/list/Makefile.am b/src/modules/list/Makefile.am index 52290210..bb75d337 100644 --- a/src/modules/list/Makefile.am +++ b/src/modules/list/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilist.la libkvilist_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilist_la_SOURCES = libkvilist.cpp listwindow.cpp -libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= listwindow.h diff --git a/src/modules/log/Makefile.am b/src/modules/log/Makefile.am index e2bfe1e9..52703f8f 100644 --- a/src/modules/log/Makefile.am +++ b/src/modules/log/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilog.la libkvilog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilog_la_SOURCES = libkvilog.cpp -libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/logview/Makefile.am b/src/modules/logview/Makefile.am index 03a1b07e..36dfce6c 100644 --- a/src/modules/logview/Makefile.am +++ b/src/modules/logview/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvilogview.la libkvilogview_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilogview_la_SOURCES = libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp -libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= logviewwidget.h logviewmdiwindow.h diff --git a/src/modules/mask/Makefile.am b/src/modules/mask/Makefile.am index 0ca529fe..1cd18470 100644 --- a/src/modules/mask/Makefile.am +++ b/src/modules/mask/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimask.la libkvimask_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimask_la_SOURCES = libkvimask.cpp -libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/math/Makefile.am b/src/modules/math/Makefile.am index 001bef24..bfaaaafa 100644 --- a/src/modules/math/Makefile.am +++ b/src/modules/math/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimath.la libkvimath_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimath_la_SOURCES = libkvimath.cpp -libkvimath_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimath_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am index 41e5b850..97e03ca3 100644 --- a/src/modules/mediaplayer/Makefile.am +++ b/src/modules/mediaplayer/Makefile.am @@ -22,7 +22,7 @@ libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \ mp_winampinterface.cpp \ mp_xmmsinterface.cpp -libkvimediaplayer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimediaplayer_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = mp_amarokinterface.h \ mp_amipinterface.h \ diff --git a/src/modules/mircimport/Makefile.am b/src/modules/mircimport/Makefile.am index d47e88c7..5bd59ac1 100644 --- a/src/modules/mircimport/Makefile.am +++ b/src/modules/mircimport/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvimircimport.la libkvimircimport_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimircimport_la_SOURCES = libkvimircimport.cpp -libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvimircimport.h diff --git a/src/modules/my/Makefile.am b/src/modules/my/Makefile.am index 4c179e48..c3d31944 100644 --- a/src/modules/my/Makefile.am +++ b/src/modules/my/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimy.la libkvimy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimy_la_SOURCES = libkvimy.cpp idle_x11.cpp idle_mac.cpp idle.cpp -libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= idle.h diff --git a/src/modules/notifier/Makefile.am b/src/modules/notifier/Makefile.am index 59639aca..8fb5cbca 100644 --- a/src/modules/notifier/Makefile.am +++ b/src/modules/notifier/Makefile.am @@ -19,7 +19,7 @@ libkvinotifier_la_SOURCES = libkvinotifier.cpp \ notifierwindowborder.cpp \ notifierwindowprogressbar.cpp -libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= \ notifiersettings.h \ diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am index c4574582..a5a81aa6 100644 --- a/src/modules/objects/Makefile.am +++ b/src/modules/objects/Makefile.am @@ -53,7 +53,7 @@ libkviobjects_la_SOURCES = libkviobjects.cpp \ class_hbox.cpp -libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= class_button.h \ class_buttongroup.h \ diff --git a/src/modules/options/Makefile.am b/src/modules/options/Makefile.am index 53c0988c..9fe8b0c4 100644 --- a/src/modules/options/Makefile.am +++ b/src/modules/options/Makefile.am @@ -57,7 +57,7 @@ libkvioptions_la_SOURCES = libkvioptions.cpp \ optw_userlist.cpp \ optw_tray.cpp -libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= container.h \ dialog.h \ diff --git a/src/modules/perl/Makefile.am b/src/modules/perl/Makefile.am index ea5e4a5b..7f6f2d8b 100644 --- a/src/modules/perl/Makefile.am +++ b/src/modules/perl/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviperl.la libkviperl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviperl_la_SOURCES = libkviperl.cpp -libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/perlcore/Makefile.am b/src/modules/perlcore/Makefile.am index a153262c..f4f555e0 100644 --- a/src/modules/perlcore/Makefile.am +++ b/src/modules/perlcore/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviperlcore.la libkviperlcore_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_PERL_LDFLAGS) libkviperlcore_la_SOURCES = libkviperlcore.cpp -libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = perlcoreinterface.h diff --git a/src/modules/popupeditor/Makefile.am b/src/modules/popupeditor/Makefile.am index a9e2f1d7..4770ecd8 100644 --- a/src/modules/popupeditor/Makefile.am +++ b/src/modules/popupeditor/Makefile.am @@ -9,7 +9,7 @@ libkvipopupeditor_la_SOURCES = libkvipopupeditor.cpp popupeditor.cpp nodist_libkvipopupeditor_la_SOURCES = moc_popupeditor.cpp noinst_HEADERS = popupeditor.h -libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/raweditor/Makefile.am b/src/modules/raweditor/Makefile.am index 74c64e9b..07ba37b3 100644 --- a/src/modules/raweditor/Makefile.am +++ b/src/modules/raweditor/Makefile.am @@ -9,7 +9,7 @@ libkviraweditor_la_SOURCES = libkviraweditor.cpp raweditor.cpp nodist_libkviraweditor_la_SOURCES = moc_raweditor.cpp noinst_HEADERS = raweditor.h -libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/regchan/Makefile.am b/src/modules/regchan/Makefile.am index c46f64aa..5f7d5479 100644 --- a/src/modules/regchan/Makefile.am +++ b/src/modules/regchan/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviregchan.la libkviregchan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviregchan_la_SOURCES = libkviregchan.cpp -libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= edituser.h diff --git a/src/modules/reguser/Makefile.am b/src/modules/reguser/Makefile.am index 93aea872..1fd16912 100644 --- a/src/modules/reguser/Makefile.am +++ b/src/modules/reguser/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvireguser.la libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp -libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= edituser.h wizard.h dialog.h nodist_libkvireguser_la_SOURCES = moc_dialog.cpp diff --git a/src/modules/rijndael/Makefile.am b/src/modules/rijndael/Makefile.am index 69b2fe01..3a46a300 100644 --- a/src/modules/rijndael/Makefile.am +++ b/src/modules/rijndael/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvirijndael.la libkvirijndael_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvirijndael_la_SOURCES = libkvirijndael.cpp rijndael.cpp ablowfish.cpp -libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvirijndael.h rijndael.h ablowfish.h diff --git a/src/modules/setup/Makefile.am b/src/modules/setup/Makefile.am index 73e3bcec..7634b3fc 100644 --- a/src/modules/setup/Makefile.am +++ b/src/modules/setup/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisetup.la libkvisetup_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisetup_la_SOURCES = libkvisetup.cpp setupwizard.cpp -libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= setupwizard.h diff --git a/src/modules/sharedfile/Makefile.am b/src/modules/sharedfile/Makefile.am index 5c4ace3b..013c24bf 100644 --- a/src/modules/sharedfile/Makefile.am +++ b/src/modules/sharedfile/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisharedfile.la libkvisharedfile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisharedfile_la_SOURCES = libkvisharedfile.cpp -libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= sharedfilewindow.h diff --git a/src/modules/sharedfileswindow/Makefile.am b/src/modules/sharedfileswindow/Makefile.am index f43e1e67..ce0a79df 100644 --- a/src/modules/sharedfileswindow/Makefile.am +++ b/src/modules/sharedfileswindow/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvisharedfileswindow.la libkvisharedfileswindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisharedfileswindow_la_SOURCES = libkvisharedfileswindow.cpp sharedfileswindow.cpp -libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= sharedfileswindow.h diff --git a/src/modules/snd/Makefile.am b/src/modules/snd/Makefile.am index 09e193a6..10e1110a 100644 --- a/src/modules/snd/Makefile.am +++ b/src/modules/snd/Makefile.am @@ -11,7 +11,7 @@ pluglib_LTLIBRARIES = libkvisnd.la libkvisnd_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisnd_la_SOURCES = libkvisnd.cpp -libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvisnd.h diff --git a/src/modules/socketspy/Makefile.am b/src/modules/socketspy/Makefile.am index 7e0a4b6b..66bf2266 100644 --- a/src/modules/socketspy/Makefile.am +++ b/src/modules/socketspy/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisocketspy.la libkvisocketspy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisocketspy_la_SOURCES = libkvisocketspy.cpp socketspywindow.cpp -libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= socketspywindow.h diff --git a/src/modules/spaste/Makefile.am b/src/modules/spaste/Makefile.am index 3912fbfe..1de6b360 100644 --- a/src/modules/spaste/Makefile.am +++ b/src/modules/spaste/Makefile.am @@ -13,7 +13,7 @@ pluglib_LTLIBRARIES = libkvispaste.la libkvispaste_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvispaste_la_SOURCES = libkvispaste.cpp controller.cpp -libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= controller.h libkvispaste.h diff --git a/src/modules/str/Makefile.am b/src/modules/str/Makefile.am index 7fe7e93a..1557f046 100644 --- a/src/modules/str/Makefile.am +++ b/src/modules/str/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvistr.la libkvistr_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvistr_la_SOURCES = libkvistr.cpp -libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/system/Makefile.am b/src/modules/system/Makefile.am index 69302d13..19d452f9 100644 --- a/src/modules/system/Makefile.am +++ b/src/modules/system/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisystem.la libkvisystem_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisystem_la_SOURCES = libkvisystem.cpp plugin.cpp -libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = plugin.h diff --git a/src/modules/term/Makefile.am b/src/modules/term/Makefile.am index 1567e615..f7a7e279 100644 --- a/src/modules/term/Makefile.am +++ b/src/modules/term/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviterm.la libkviterm_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviterm_la_SOURCES = libkviterm.cpp termwidget.cpp termwindow.cpp -libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= termwidget.h termwindow.h diff --git a/src/modules/texticons/Makefile.am b/src/modules/texticons/Makefile.am index 77646abd..447d85dd 100644 --- a/src/modules/texticons/Makefile.am +++ b/src/modules/texticons/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitexticons.la libkvitexticons_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitexticons_la_SOURCES = libkvitexticons.cpp -libkvitexticons_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitexticons_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/theme/Makefile.am b/src/modules/theme/Makefile.am index 5417e9e5..079c436b 100644 --- a/src/modules/theme/Makefile.am +++ b/src/modules/theme/Makefile.am @@ -19,7 +19,7 @@ nodist_libkvitheme_la_SOURCES = moc_managementdialog.cpp \ moc_packthemedialog.cpp \ moc_savethemedialog.cpp -libkvitheme_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitheme_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= managementdialog.h \ packthemedialog.h \ diff --git a/src/modules/tip/Makefile.am b/src/modules/tip/Makefile.am index 2a9fbbcb..37be4b04 100644 --- a/src/modules/tip/Makefile.am +++ b/src/modules/tip/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitip.la libkvitip_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitip_la_SOURCES = libkvitip.cpp -libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvitip.h diff --git a/src/modules/tmphighlight/Makefile.am b/src/modules/tmphighlight/Makefile.am index b35caea8..1a9c1461 100644 --- a/src/modules/tmphighlight/Makefile.am +++ b/src/modules/tmphighlight/Makefile.am @@ -13,7 +13,7 @@ pluglib_LTLIBRARIES = libkvitmphighlight.la libkvitmphighlight_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitmphighlight_la_SOURCES = libkvitmphighlight.cpp -libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= diff --git a/src/modules/toolbar/Makefile.am b/src/modules/toolbar/Makefile.am index e009e306..445235f2 100644 --- a/src/modules/toolbar/Makefile.am +++ b/src/modules/toolbar/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitoolbar.la libkvitoolbar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitoolbar_la_SOURCES = libkvitoolbar.cpp -libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/toolbareditor/Makefile.am b/src/modules/toolbareditor/Makefile.am index a578e10c..9b05887a 100644 --- a/src/modules/toolbareditor/Makefile.am +++ b/src/modules/toolbareditor/Makefile.am @@ -14,7 +14,7 @@ libkvitoolbareditor_la_SOURCES = libkvitoolbareditor.cpp toolbareditor.cpp nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp noinst_HEADERS = toolbareditor.h -libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la moc_toolbareditor.cpp: toolbareditor.h $(SS_QT_MOC) $< -o $@ diff --git a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am index fff58478..5325de6b 100644 --- a/src/modules/torrent/Makefile.am +++ b/src/modules/torrent/Makefile.am @@ -17,7 +17,7 @@ libkvitorrent_la_SOURCES = libkvitorrent.cpp \ tc_ktorrentdcopinterface.cpp \ tc_statusbarapplet.cpp -libkvitorrent_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitorrent_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = tc_interface.h \ tc_ktorrentdcopinterface.h \ diff --git a/src/modules/url/Makefile.am b/src/modules/url/Makefile.am index c2d88957..ab6d4a29 100644 --- a/src/modules/url/Makefile.am +++ b/src/modules/url/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkviurl.la libkviurl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviurl_la_SOURCES = libkviurl.cpp -libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviurl.h icons.h diff --git a/src/modules/window/Makefile.am b/src/modules/window/Makefile.am index 52912925..2ee70e4d 100644 --- a/src/modules/window/Makefile.am +++ b/src/modules/window/Makefile.am @@ -13,7 +13,7 @@ nodist_libkviwindow_la_SOURCES = moc_userwindow.cpp libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp -libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= userwindow.h -- cgit v1.2.3