diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:16 -0600 |
| commit | 1048c4f709440bb51647af5ece46667545490ab8 (patch) | |
| tree | 851fb2b152218069f4a83c468ccd88f292ce0650 /kbattleship | |
| parent | a8333c4f4e4f6b842a9843efdfb47f1f278467e0 (diff) | |
| download | tdegames-1048c4f709440bb51647af5ece46667545490ab8.tar.gz tdegames-1048c4f709440bb51647af5ece46667545490ab8.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbattleship')
| -rw-r--r-- | kbattleship/kbattleship/Makefile.am | 2 | ||||
| -rw-r--r-- | kbattleship/kbattleship/dialogs/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kbattleship/kbattleship/Makefile.am b/kbattleship/kbattleship/Makefile.am index 1076dc58..56004d82 100644 --- a/kbattleship/kbattleship/Makefile.am +++ b/kbattleship/kbattleship/Makefile.am @@ -15,7 +15,7 @@ kbattleship_SOURCES = kbaiplayer.cpp kbstrategy.cpp kbverticalstepstrategy.cpp\ kbchooserstrategy.cpp kbattleship.cpp main.cpp kbattleship_LDADD = $(LIB_TDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(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) -lktexteditor +kbattleship_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kbattleship_DEPENDENCIES = $(LIB_TDEGAMES_DEP) services_DATA = _kbattleship._tcp diff --git a/kbattleship/kbattleship/dialogs/Makefile.am b/kbattleship/kbattleship/dialogs/Makefile.am index 383349a4..0d83ff7e 100644 --- a/kbattleship/kbattleship/dialogs/Makefile.am +++ b/kbattleship/kbattleship/dialogs/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libkbattleshipdialogs.la libkbattleshipdialogs_la_SOURCES = dummy.cpp connectDlg.ui serverDlg.ui \ chatDlg.ui statDlg.ui infoDlg.ui -libkbattleshipdialogs_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkbattleshipdialogs_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libkbattleshipdialogs_la_LIBADD = $(LIB_TDEUI) dummy.cpp: |