TDE
/
piklab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/piklab
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 12 years ago
parent 151a9ebb24
commit c0695dee38
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

2
src/data/app_data/piklabui.rc
Unescape View File

@ -185,7 +185,7 @@
<Action name="debug_reset" />
</ToolBar>
<Menu name="ktexteditor_popup">
<Menu name="tdetexteditor_popup">
<Action name="enable_breakpoint" />
<Action name="toggle_breakpoint" />
<Action name="clear_breakpoints" />

2
src/libgui/console.cpp
Unescape View File

@ -13,7 +13,7 @@
#include <tqdir.h>
#include <klibloader.h>
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kde_terminal_interface.h>
ConsoleView::ConsoleView(TQWidget *parent)

2
src/libgui/hex_editor.h
Unescape View File

@ -10,7 +10,7 @@
#ifndef HEX_EDITOR_H
#define HEX_EDITOR_H
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "device_editor.h"
#include "devices/base/hex_buffer.h"

4
src/libgui/text_editor.cpp
Unescape View File

@ -19,7 +19,7 @@
#include <kfiledialog.h>
#include <klocale.h>
#include <kapplication.h>
#include <ktexteditor/markinterface.h>
#include <tdetexteditor/markinterface.h>
#include "main_global.h"
#include "gui_debug_manager.h"
@ -101,7 +101,7 @@ void TextEditor::addView()
v->setFocus();
v->child(0, "KateViewInternal")->installEventFilter(this);
KTextEditor::PopupMenuInterface *pmi = KTextEditor::popupMenuInterface(v);
pmi->installPopup(&Main::popup("ktexteditor_popup"));
pmi->installPopup(&Main::popup("tdetexteditor_popup"));
// dispatch available space between views
TQValueList<int> list = _split->sizes();

2
src/piklab-coff/Makefile.am
Unescape View File

@ -12,5 +12,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_coff_DEPENDENCIES = $(OBJ)
piklab_coff_LDADD = $(OBJ) $(LIB_KIO)
piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
piklab_coff_SOURCES = main.cpp

2
src/piklab-hex/Makefile.am
Unescape View File

@ -11,5 +11,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_hex_DEPENDENCIES = $(OBJ)
piklab_hex_LDADD = $(OBJ) $(LIB_KIO)
piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
piklab_hex_SOURCES = main.cpp

2
src/piklab-prog/Makefile.am
Unescape View File

@ -27,5 +27,5 @@ OBJ = $(top_builddir)/src/progs/list/libproglistnoui.la \
$(top_builddir)/src/common/common/libcommon.la
piklab_prog_DEPENDENCIES = $(OBJ)
piklab_prog_LDADD = $(OBJ) $(LIB_KIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS)
piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp

6
src/piklab-test/generators/Makefile.am
Unescape View File

@ -17,15 +17,15 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
gputils_config_generator_check_DEPENDENCIES = $(OBJ)
gputils_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
gputils_config_generator_check_SOURCES = gputils_config_generator_check.cpp
gputils_template_generator_check_DEPENDENCIES = $(OBJ)
gputils_template_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp
sdcc_config_generator_check_DEPENDENCIES = $(OBJ)
sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
sdcc_config_generator_check_SOURCES = sdcc_config_generator_check.cpp

2
src/piklab-test/misc/Makefile.am
Unescape View File

@ -6,5 +6,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common
$(top_builddir)/src/common/global/libglobal.la $(top_builddir)/src/common/common/libcommon.la
misc_check_DEPENDENCIES = $(OBJ)
misc_check_LDADD = $(OBJ) $(LIB_KIO)
misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
misc_check_SOURCES = misc_check.cpp

2
src/piklab-test/save_load_memory/Makefile.am
Unescape View File

@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
save_load_memory_check_DEPENDENCIES = $(OBJ)
save_load_memory_check_LDADD = $(OBJ) $(LIB_KIO)
save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
save_load_memory_check_SOURCES = save_load_memory_check.cpp

4
src/piklab/Makefile.am
Unescape View File

@ -57,7 +57,7 @@ OBJS = $(top_builddir)/src/libgui/libgui.la \
$(top_builddir)/src/devices/mem24/mem24/libmem24.la $(top_builddir)/src/devices/mem24/base/libmem24base.la \
$(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_LDADD = $(OBJS) -lktexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
piklab_DEPENDENCIES = $(OBJS)
piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
piklab_SOURCES = main.cpp

Write Preview
Loading…
Cancel
Save