diff options
| author |  José Melo | 2008-03-28 11:18:30 +0000 |
|---|---|---|
| committer | José Melo | 2008-03-28 11:18:30 +0000 |
| commit | 027594a894f9a86220faaeb413c71b5b44ee1a3d (patch) | |
| tree | 7ebaecd0faa3aca0781f76e88502cb99f76234a9 | |
| parent | assign categories to be xdg compliant (diff) | |
| download | KVIrc-027594a894f9a86220faaeb413c71b5b44ee1a3d.tar.gz KVIrc-027594a894f9a86220faaeb413c71b5b44ee1a3d.tar.bz2 KVIrc-027594a894f9a86220faaeb413c71b5b44ee1a3d.zip | |
rename libkvilib into libkvirclib to avoid conflicts with older releases
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1314 17fca916-40b9-46aa-a4ea-0a15b648b75c
68 files changed, 79 insertions, 79 deletions
diff --git a/doc/INSTALL-MacOS.txt b/doc/INSTALL-MacOS.txt index e0733aebd..aec3de4af 100644 --- a/doc/INSTALL-MacOS.txt +++ b/doc/INSTALL-MacOS.txt @@ -120,13 +120,13 @@ Now run make and relax :-) 5) Relinking -KVirc and its modules depend on libkvilib and libqt which are not in the dynamic linker search path by default. The paths set during the compilation are absolute paths and have to be changed to be realtive to the executable path. +KVirc and its modules depend on libkvirclib and libqt which are not in the dynamic linker search path by default. The paths set during the compilation are absolute paths and have to be changed to be realtive to the executable path. -The following commands do this for libkvilib: +The following commands do this for libkvirclib: -# install_name_tool -id @executable_path/../Frameworks/libkvilib.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib -# install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib @executable_path/../Frameworks/libkvilib.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc -# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib @executable_path/../Frameworks/libkvilib.3.dylib +# install_name_tool -id @executable_path/../Frameworks/libkvirclib.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvirclib.3.dylib +# install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvirclib.3.dylib @executable_path/../Frameworks/libkvirclib.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc +# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvirclib.3.dylib @executable_path/../Frameworks/libkvirclib.3.dylib Now you have to decide whether you want to include libqt within the bundle or not. This is useful if you consider to share your bundle with your friends and they don't want to compile QT themselves. @@ -149,7 +149,7 @@ Relinking commands for libqt: # install_name_tool -id @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libqt-mt.3.dylib # install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc -# install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib +# install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvirclib.3.dylib # find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib 6) Cleaning up diff --git a/src/kvilib/build/.svnignore b/src/kvilib/build/.svnignore index 3293c87c1..9b685e611 100644 --- a/src/kvilib/build/.svnignore +++ b/src/kvilib/build/.svnignore @@ -14,5 +14,5 @@ stamp.h.in *.la *.so *.lai -libkvilib.la +libkvirclib.la symlinks diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am index 0b3987236..5b9d29afb 100644 --- a/src/kvilib/build/Makefile.am +++ b/src/kvilib/build/Makefile.am @@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ $(SS_INCDIRS) $(SS_CPPFLAGS) -lib_LTLIBRARIES = libkvilib.la -libkvilib_la_LDFLAGS = $(SS_LDFLAGS) -version-info 4:0:0 $(SS_LIBDIRS) -libkvilib_la_LIBADD = $(SS_LIBLINK) +lib_LTLIBRARIES = libkvirclib.la +libkvirclib_la_LDFLAGS = $(SS_LDFLAGS) -version-info 4:0:0 $(SS_LIBDIRS) +libkvirclib_la_LIBADD = $(SS_LIBLINK) # # Command useful to find out all the sources @@ -17,7 +17,7 @@ libkvilib_la_LIBADD = $(SS_LIBLINK) # echo $SRC # -nodist_libkvilib_la_SOURCES = \ +nodist_libkvirclib_la_SOURCES = \ ../ext/moc_kvi_crypt.cpp \ ../ext/moc_kvi_garbage.cpp \ ../ext/moc_kvi_regusersdb.cpp \ @@ -29,7 +29,7 @@ nodist_libkvilib_la_SOURCES = \ ../system/moc_kvi_thread.cpp \ ../tal/moc_kvi_tal_wizard.cpp -libkvilib_la_SOURCES = \ +libkvirclib_la_SOURCES = \ ../core/kvi_error.cpp \ ../core/kvi_heapobject.cpp \ ../core/kvi_malloc.cpp \ diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am index 51a46703f..67a2eed17 100644 --- a/src/kvirc/build/Makefile.am +++ b/src/kvirc/build/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" kvirc4_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -kvirc4_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +kvirc4_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvirclib.la bin_PROGRAMS = kvirc4 diff --git a/src/modules/about/Makefile.am b/src/modules/about/Makefile.am index 4192c1195..2331e8e89 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= aboutdialog.h diff --git a/src/modules/action/Makefile.am b/src/modules/action/Makefile.am index 2015e9084..dc50729ed 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) ../../kvilib/build/libkvirclib.la #noinst_HEADERS= actiondialog.h diff --git a/src/modules/actioneditor/Makefile.am b/src/modules/actioneditor/Makefile.am index 84ce9dd71..965c87483 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/addon/Makefile.am b/src/modules/addon/Makefile.am index e232b8ffc..dfbddd5b9 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= managementdialog.h diff --git a/src/modules/aliaseditor/Makefile.am b/src/modules/aliaseditor/Makefile.am index 60845dbcf..87a24d7ef 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/avatar/Makefile.am b/src/modules/avatar/Makefile.am index 8e8a793a2..31a314b06 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS = libkviavatar.h diff --git a/src/modules/chan/Makefile.am b/src/modules/chan/Makefile.am index 620836ac4..4e6f3378d 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/channelsjoin/Makefile.am b/src/modules/channelsjoin/Makefile.am index c9f8a78ed..8a5da0eee 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= channelsjoinwindow.h diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am index bf0a6816f..21e862336 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkviclock.h diff --git a/src/modules/codetester/Makefile.am b/src/modules/codetester/Makefile.am index 37540094a..12162ae15 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/config/Makefile.am b/src/modules/config/Makefile.am index 1a43c2e97..02dac000d 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/context/Makefile.am b/src/modules/context/Makefile.am index e4ec3252d..73c2959d3 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/dcc/Makefile.am b/src/modules/dcc/Makefile.am index 8a63b8882..a369639f3 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= adpcmcodec.h \ broker.h \ diff --git a/src/modules/dialog/Makefile.am b/src/modules/dialog/Makefile.am index 06018a14f..561ca1da1 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvidialog.h diff --git a/src/modules/editor/Makefile.am b/src/modules/editor/Makefile.am index beb22541e..344f32eb0 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= scripteditor.h diff --git a/src/modules/eventeditor/Makefile.am b/src/modules/eventeditor/Makefile.am index ceb7541ae..044df3f97 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/file/Makefile.am b/src/modules/file/Makefile.am index 1545a63a7..bf2d0a880 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/filetransferwindow/Makefile.am b/src/modules/filetransferwindow/Makefile.am index 910d86b40..6a2bfe33d 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= filetransferwindow.h diff --git a/src/modules/help/Makefile.am b/src/modules/help/Makefile.am index fe6f03f61..182d0f06e 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= helpwidget.h helpwindow.h index.h diff --git a/src/modules/http/Makefile.am b/src/modules/http/Makefile.am index ab7fe3b27..e33869f4d 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= httpfiletransfer.h diff --git a/src/modules/ident/Makefile.am b/src/modules/ident/Makefile.am index c02c0b479..ccc3a4f6b 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkviident.h diff --git a/src/modules/iograph/Makefile.am b/src/modules/iograph/Makefile.am index a9ea3928e..dfa626ae2 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkviiograph.h diff --git a/src/modules/lamerizer/Makefile.am b/src/modules/lamerizer/Makefile.am index ce798e5c0..9340d35e5 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvilamerizer.h diff --git a/src/modules/language/Makefile.am b/src/modules/language/Makefile.am index d78cda9f5..fb3290b6a 100644 --- a/src/modules/language/Makefile.am +++ b/src/modules/language/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilanguage.la libkvilanguage_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilanguage_la_SOURCES = libkvilanguage.cpp -libkvilanguage_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilanguage_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/links/Makefile.am b/src/modules/links/Makefile.am index 51eea094d..5fedf6f07 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= linkswindow.h diff --git a/src/modules/list/Makefile.am b/src/modules/list/Makefile.am index 522902108..dbacc1ffd 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= listwindow.h diff --git a/src/modules/log/Makefile.am b/src/modules/log/Makefile.am index e2bfe1e91..64b7588d3 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/logview/Makefile.am b/src/modules/logview/Makefile.am index 03a1b07eb..37fd4db95 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= logviewwidget.h logviewmdiwindow.h diff --git a/src/modules/mask/Makefile.am b/src/modules/mask/Makefile.am index 0ca529fed..179c5418a 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/math/Makefile.am b/src/modules/math/Makefile.am index 001bef244..f1439d6c3 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am index 93c2fc10d..bbe337bea 100644 --- a/src/modules/mediaplayer/Makefile.am +++ b/src/modules/mediaplayer/Makefile.am @@ -23,7 +23,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) ../../kvilib/build/libkvirclib.la noinst_HEADERS = mp_amarokinterface.h \ mp_amipinterface.h \ diff --git a/src/modules/mircimport/Makefile.am b/src/modules/mircimport/Makefile.am index d47e88c7f..8e8fe5b14 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvimircimport.h diff --git a/src/modules/my/Makefile.am b/src/modules/my/Makefile.am index 4c179e487..19aa68923 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= idle.h diff --git a/src/modules/notifier/Makefile.am b/src/modules/notifier/Makefile.am index 59639acaa..33287c62b 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= \ notifiersettings.h \ diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am index ea66fc31c..1733ca448 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) ../../kvilib/build/libkvirclib.la
noinst_HEADERS= class_button.h \
class_buttongroup.h \
diff --git a/src/modules/options/Makefile.am b/src/modules/options/Makefile.am index 53c0988c7..e266beb81 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= container.h \ dialog.h \ diff --git a/src/modules/perl/Makefile.am b/src/modules/perl/Makefile.am index ea5e4a5b1..487d56901 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/perlcore/Makefile.am b/src/modules/perlcore/Makefile.am index a153262cd..009640bc6 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS = perlcoreinterface.h diff --git a/src/modules/popupeditor/Makefile.am b/src/modules/popupeditor/Makefile.am index a9e2f1d7f..73bb3d4e2 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/raweditor/Makefile.am b/src/modules/raweditor/Makefile.am index 74c64e9b1..9a432deda 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/regchan/Makefile.am b/src/modules/regchan/Makefile.am index c46f64aae..7200db398 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) ../../kvilib/build/libkvirclib.la #noinst_HEADERS= edituser.h diff --git a/src/modules/reguser/Makefile.am b/src/modules/reguser/Makefile.am index 93aea8724..0b41fff03 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) ../../kvilib/build/libkvirclib.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 69b2fe01d..1a3b3bc31 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvirijndael.h rijndael.h ablowfish.h diff --git a/src/modules/setup/Makefile.am b/src/modules/setup/Makefile.am index 73e3bcec0..c3a11dcd0 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= setupwizard.h diff --git a/src/modules/sharedfile/Makefile.am b/src/modules/sharedfile/Makefile.am index 5c4ace3bc..c1dc9b753 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) ../../kvilib/build/libkvirclib.la #noinst_HEADERS= sharedfilewindow.h diff --git a/src/modules/sharedfileswindow/Makefile.am b/src/modules/sharedfileswindow/Makefile.am index f43e1e671..87e0252da 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= sharedfileswindow.h diff --git a/src/modules/snd/Makefile.am b/src/modules/snd/Makefile.am index d57760101..dea1c56b5 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvisnd.h diff --git a/src/modules/socketspy/Makefile.am b/src/modules/socketspy/Makefile.am index 7e0a4b6b1..22f40484d 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= socketspywindow.h diff --git a/src/modules/spaste/Makefile.am b/src/modules/spaste/Makefile.am index f1a6f7195..4728be980 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= controller.h libkvispaste.h diff --git a/src/modules/str/Makefile.am b/src/modules/str/Makefile.am index 7fe7e93a8..799fd261d 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/system/Makefile.am b/src/modules/system/Makefile.am index 69302d13c..7efa26d8d 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS = plugin.h diff --git a/src/modules/term/Makefile.am b/src/modules/term/Makefile.am index 1567e6154..b6756464e 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= termwidget.h termwindow.h diff --git a/src/modules/texticons/Makefile.am b/src/modules/texticons/Makefile.am index 77646abd9..99d2d8c85 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/theme/Makefile.am b/src/modules/theme/Makefile.am index 5417e9e5e..e8a238799 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= managementdialog.h \ packthemedialog.h \ diff --git a/src/modules/tip/Makefile.am b/src/modules/tip/Makefile.am index 2a9fbbcb0..2b6bbfdd5 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvitip.h diff --git a/src/modules/tmphighlight/Makefile.am b/src/modules/tmphighlight/Makefile.am index 6e5a02ace..8d665f2bf 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) ../../kvilib/build/libkvirclib.la #noinst_HEADERS= diff --git a/src/modules/toolbar/Makefile.am b/src/modules/toolbar/Makefile.am index e009e306f..b9f2245cf 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) ../../kvilib/build/libkvirclib.la # noinst_HEADERS= diff --git a/src/modules/toolbareditor/Makefile.am b/src/modules/toolbareditor/Makefile.am index a578e10c2..6e0343cda 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) ../../kvilib/build/libkvirclib.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 ab0d80cb2..59d377893 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS = tc_interface.h \ tc_ktorrentdcopinterface.h \ diff --git a/src/modules/trayicon/Makefile b/src/modules/trayicon/Makefile index 306c0ad67..6f4dedbf7 100644 --- a/src/modules/trayicon/Makefile +++ b/src/modules/trayicon/Makefile @@ -65,7 +65,7 @@ pluglibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pluglib_LTLIBRARIES) am__DEPENDENCIES_1 = libkvitrayicon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - ../../kvilib/build/libkvilib.la + ../../kvilib/build/libkvirclib.la am_libkvitrayicon_la_OBJECTS = libkvitrayicon.lo libkvitrayicon_la_OBJECTS = $(am_libkvitrayicon_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src @@ -246,7 +246,7 @@ libkvitrayicon_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitrayicon_la_SOURCES = libkvitrayicon.cpp #nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp -libkvitrayicon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitrayicon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvirclib.la noinst_HEADERS = libkvitrayicon.h tmpdir = $(picsdir) tmp_DATA = kvi_dock.png kvi_dock_part-0.png kvi_dock_part-1.png kvi_dock_part-2.png diff --git a/src/modules/trayicon/Makefile.am b/src/modules/trayicon/Makefile.am index 345c99ef2..695a525c9 100644 --- a/src/modules/trayicon/Makefile.am +++ b/src/modules/trayicon/Makefile.am @@ -13,7 +13,7 @@ libkvitrayicon_la_SOURCES = libkvitrayicon.cpp #nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp -libkvitrayicon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitrayicon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkvitrayicon.h diff --git a/src/modules/trayicon/Makefile.in b/src/modules/trayicon/Makefile.in index 351eba2de..013bf06ee 100644 --- a/src/modules/trayicon/Makefile.in +++ b/src/modules/trayicon/Makefile.in @@ -65,7 +65,7 @@ pluglibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pluglib_LTLIBRARIES) am__DEPENDENCIES_1 = libkvitrayicon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - ../../kvilib/build/libkvilib.la + ../../kvilib/build/libkvirclib.la am_libkvitrayicon_la_OBJECTS = libkvitrayicon.lo libkvitrayicon_la_OBJECTS = $(am_libkvitrayicon_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src @@ -246,7 +246,7 @@ libkvitrayicon_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitrayicon_la_SOURCES = libkvitrayicon.cpp #nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp -libkvitrayicon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitrayicon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvirclib.la noinst_HEADERS = libkvitrayicon.h tmpdir = $(picsdir) tmp_DATA = kvi_dock.png kvi_dock_part-0.png kvi_dock_part-1.png kvi_dock_part-2.png diff --git a/src/modules/url/Makefile.am b/src/modules/url/Makefile.am index c2d88957e..41a8e38b2 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= libkviurl.h icons.h diff --git a/src/modules/window/Makefile.am b/src/modules/window/Makefile.am index 529129257..4e7141a9d 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) ../../kvilib/build/libkvirclib.la noinst_HEADERS= userwindow.h |