diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /karm/test | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'karm/test')
| -rw-r--r-- | karm/test/Makefile.am | 4 | ||||
| -rw-r--r-- | karm/test/locking.cpp | 2 | ||||
| -rwxr-xr-x | karm/test/remote_storage.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am index 3940fb373..506991391 100644 --- a/karm/test/Makefile.am +++ b/karm/test/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO check_PROGRAMS = runscripts locking runscripts_SOURCES = script.cpp runscripts.cpp -runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE) locking_SOURCES = locking.cpp lockerthread.cpp -locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index ac1de23e3..448e7c1dc 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -128,7 +128,7 @@ int main( int argc, char *argv[] ) short rval = 0; // Use another directory than the real one, just to keep things clean - // TDEHOME needs to be writable though, for a ksycoca database + // TDEHOME needs to be writable though, for a tdesycoca database // FIXME: Delete this directory when done with test. setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true ); diff --git a/karm/test/remote_storage.sh b/karm/test/remote_storage.sh index a4335b6c1..84af71c59 100755 --- a/karm/test/remote_storage.sh +++ b/karm/test/remote_storage.sh @@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null` if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi; if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; fi -# if the file does not exist, kresources pops up a modal dialog box +# if the file does not exist, tderesources pops up a modal dialog box # telling us that a file does not exist. touch $TESTFILE_LOCAL |