[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kparts/tests
From:       David Faure <faure () kde ! org>
Date:       2005-05-27 16:09:18
Message-ID: 1117210158.026826.28585.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 418756 by dfaure:

Fix for make check (especially with hidden-visibility): don't link to a part.


 M  +10 -7     Makefile.am  
 M  +0 -2      notepad.cpp  
 A             notepadpart.cpp   branches/KDE/3.4/kdelibs/kparts/tests/notepadpart.cpp#418753


--- trunk/KDE/kdelibs/kparts/tests/Makefile.am #418755:418756
@@ -3,27 +3,30 @@
 AM_LDFLAGS = $(all_libraries)
 LDADD = $(LIB_KPARTS)
 
-check_PROGRAMS = kpartstest normalktmtest ghostviewtest 
+check_PROGRAMS = kpartstest normalktmtest ghostviewtest
 
 kpartstest_SOURCES = example.cpp parts.cpp
-kpartstest_LDADD = libnotepadpart.la
+kpartstest_LDADD = libnotepad.la $(LIB_KPARTS)
 normalktmtest_SOURCES = normalktm.cpp parts.cpp
-normalktmtest_LDADD = libnotepadpart.la
+normalktmtest_LDADD = libnotepad.la $(LIB_KPARTS)
 ghostviewtest_SOURCES = ghostview.cpp
-ghostviewtest_LDADD = $(LIB_KPARTS) 
+ghostviewtest_LDADD = $(LIB_KPARTS)
 
 # These are not really libraries, but modules dynamically opened.
-# So they should be installed in kde_module_dir, which is usually $prefix/lib/kde2
+# So they should be installed in kde_module_dir, which is usually $prefix/lib/kde3
 kde_module_LTLIBRARIES = libspellcheckplugin.la libnotepadpart.la
 
 libspellcheckplugin_la_SOURCES = plugin_spellcheck.cpp
 libspellcheckplugin_la_LIBADD = $(LIB_KPARTS) 
 libspellcheckplugin_la_LDFLAGS = -module $(KDE_PLUGIN)
 
-libnotepadpart_la_SOURCES = notepad.cpp
-libnotepadpart_la_LIBADD = $(LIB_KPARTS)
+libnotepadpart_la_SOURCES = notepadpart.cpp
+libnotepadpart_la_LIBADD = libnotepad.la $(LIB_KPARTS)
 libnotepadpart_la_LDFLAGS = -module $(KDE_PLUGIN)
 
+noinst_LTLIBRARIES = libnotepad.la
+libnotepad_la_SOURCES = notepad.cpp
+
 rcdir = $(kde_datadir)/kpartstest
 rc_DATA = kpartstest_shell.rc
 
--- trunk/KDE/kdelibs/kparts/tests/notepad.cpp #418755:418756
@@ -16,8 +16,6 @@
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 
-K_EXPORT_COMPONENT_FACTORY( libnotepadpart, NotepadFactory )
-
 NotepadPart::NotepadPart( QWidget* parentWidget, const char*,
                           QObject* parent, const char* name,
                           const QStringList& )
[prev in list] [next in list] [prev in thread] [next in thread]