diff --git a/kbattleship/kbattleship/Makefile.am b/kbattleship/kbattleship/Makefile.am index 56004d82..67becb36 100644 --- a/kbattleship/kbattleship/Makefile.am +++ b/kbattleship/kbattleship/Makefile.am @@ -13,7 +13,7 @@ kbattleship_SOURCES = kbaiplayer.cpp kbstrategy.cpp kbverticalstepstrategy.cpp\ kstatdialog.cpp kbdiagonalshotstrategy.cpp \ konnectionhandling.cpp kship.cpp kshiplist.cpp \ kbchooserstrategy.cpp kbattleship.cpp main.cpp -kbattleship_LDADD = $(LIB_TDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(LIB_KDNSSD) +kbattleship_LDADD = $(LIB_TDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_TDEFILE) $(LIB_KDNSSD) kbattleship_COMPILE_FIRST = dialogs/infoDlg.h dialogs/chatDlg.h dialogs/connectDlg.h dialogs/serverDlg.h dialogs/statDlg.h kbattleship_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kbattleship_DEPENDENCIES = $(LIB_TDEGAMES_DEP) diff --git a/kbounce/Makefile.am b/kbounce/Makefile.am index 78a19e48..6b88fb2c 100644 --- a/kbounce/Makefile.am +++ b/kbounce/Makefile.am @@ -13,7 +13,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE) bin_PROGRAMS = kbounce kbounce_SOURCES = main.cpp kbounce.cpp game.cpp highscores.cpp kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -kbounce_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) $(LIB_ARTS) $(artslib) -lmcop +kbounce_LDADD = $(LIB_TDEGAMES) $(LIB_TDEFILE) $(LIB_ARTS) $(artslib) -lmcop kbounce_DEPENDENCIES = $(LIB_TDEGAMES_DEP) xdg_apps_DATA = kbounce.desktop diff --git a/kgoldrunner/src/Makefile.am b/kgoldrunner/src/Makefile.am index 16ac5a7b..6f589e8d 100644 --- a/kgoldrunner/src/Makefile.am +++ b/kgoldrunner/src/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes) kgoldrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. -kgoldrunner_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) $(LIB_TDEPRINT) +kgoldrunner_LDADD = $(LIB_TDEGAMES) $(LIB_TDEFILE) $(LIB_TDEPRINT) kgoldrunner_DEPENDENCIES = $(LIB_TDEGAMES_DEP) # which sources should be compiled for kgoldrunner diff --git a/kjumpingcube/Makefile.am b/kjumpingcube/Makefile.am index 04cf21cb..5645fd0f 100644 --- a/kjumpingcube/Makefile.am +++ b/kjumpingcube/Makefile.am @@ -9,7 +9,7 @@ kjumpingcube_SOURCES = kjumpingcube.cpp kcubeboxwidget.cpp main.cpp \ settings.ui prefs.kcfgc kjumpingcube_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kjumpingcube_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) +kjumpingcube_LDADD = $(LIB_TDEGAMES) $(LIB_TDEFILE) kjumpingcube_DEPENDENCIES = $(LIB_TDEGAMES_DEP) xdg_apps_DATA = kjumpingcube.desktop diff --git a/kmahjongg/Makefile.am b/kmahjongg/Makefile.am index 2ff5492c..89c7efc5 100644 --- a/kmahjongg/Makefile.am +++ b/kmahjongg/Makefile.am @@ -9,7 +9,7 @@ kmahjongg_SOURCES = main.cpp kmahjongg.cpp boardwidget.cpp \ Background.cpp Preview.cpp prefs.kcfgc \ Editor.cpp HighScore.cpp settings.ui kmahjongg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kmahjongg_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) +kmahjongg_LDADD = $(LIB_TDEGAMES) $(LIB_TDEFILE) kmahjongg_DEPENDENCIES = $(LIB_TDEGAMES_DEP) METASOURCES = AUTO diff --git a/kpat/Makefile.am b/kpat/Makefile.am index 259bc0d1..adad7447 100644 --- a/kpat/Makefile.am +++ b/kpat/Makefile.am @@ -10,7 +10,7 @@ kpat_SOURCES = main.cpp cardmaps.cpp card.cpp dealer.cpp \ gamestatsimpl.cpp \ gamestats.ui kpat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kpat_LDADD = $(LIB_KFILE) $(LIB_TDEGAMES) ./freecell-solver/libfcs.la +kpat_LDADD = $(LIB_TDEFILE) $(LIB_TDEGAMES) ./freecell-solver/libfcs.la kpat_DEPENDENCIES = $(LIB_TDEGAMES_DEP) METASOURCES = AUTO diff --git a/ktuberling/Makefile.am b/ktuberling/Makefile.am index 0b820190..6e7ea3bc 100644 --- a/ktuberling/Makefile.am +++ b/ktuberling/Makefile.am @@ -20,7 +20,7 @@ ktuberling_SOURCES = action.cpp main.cpp toplevel.cpp playground.cpp todraw.cpp ktuberling_METASOURCES = AUTO ktuberling_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ktuberling_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) -ltdeprint +ktuberling_LDADD = $(LIB_TDEGAMES) $(LIB_TDEFILE) -ltdeprint ktuberling_DEPENDENCIES = $(LIB_TDEGAMES_DEP) KDE_ICON = ktuberling diff --git a/libtdegames/highscore/tdefilelock.h b/libtdegames/highscore/tdefilelock.h index de47f945..90c84c5f 100644 --- a/libtdegames/highscore/tdefilelock.h +++ b/libtdegames/highscore/tdefilelock.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KFILELOCK_H -#define KFILELOCK_H +#ifndef TDEFILELOCK_H +#define TDEFILELOCK_H class KFileLock diff --git a/lskat/lskat/Makefile.am b/lskat/lskat/Makefile.am index 3f04d16b..400b5b2e 100644 --- a/lskat/lskat/Makefile.am +++ b/lskat/lskat/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = lskat lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp TDEProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui -lskat_LDADD = $(LIB_KFILE) $(LIB_TDEGAMES) $(LIB_KDNSSD) +lskat_LDADD = $(LIB_TDEFILE) $(LIB_TDEGAMES) $(LIB_KDNSSD) lskat_DEPENDENCIES = $(LIB_TDEGAMES_DEP) INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes) diff --git a/lskat/lskatproc/Makefile.am b/lskat/lskatproc/Makefile.am index 41fbe62a..e733ac13 100644 --- a/lskat/lskatproc/Makefile.am +++ b/lskat/lskatproc/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = lskatproc lskatproc_SOURCES = lskatproc.cpp KChildConnect.cpp KInputChildProcess.cpp KEMessage.cpp KMessageEntry.cpp main.cpp -lskatproc_LDADD = $(LIB_KFILE) +lskatproc_LDADD = $(LIB_TDEFILE) # set the include path for X, qt and KDE INCLUDES= $(all_includes) diff --git a/twin4/twin4/Makefile.am b/twin4/twin4/Makefile.am index 21f84e02..f2a0e841 100644 --- a/twin4/twin4/Makefile.am +++ b/twin4/twin4/Makefile.am @@ -4,11 +4,11 @@ twin4_SOURCES = main.cpp twin4.cpp twin4view.cpp twin4doc.cpp \ twin4player.cpp kspritecache.cpp \ scorewidget.cpp prefs.kcfgc settings.ui statistics.ui statuswidget.ui -twin4_LDADD = $(LIB_KFILE) $(LIB_TDEGAMES) +twin4_LDADD = $(LIB_TDEFILE) $(LIB_TDEGAMES) twin4_DEPENDENCIES = $(LIB_TDEGAMES_DEP) twin4proc_SOURCES = twin4proc.cpp -twin4proc_LDADD = $(LIB_KFILE) $(LIB_TDEGAMES) +twin4proc_LDADD = $(LIB_TDEFILE) $(LIB_TDEGAMES) twin4proc_DEPENDENCIES = $(LIB_TDEGAMES_DEP) INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/kgame $(all_includes)