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

Rename a few build variables for overall consistency

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 1cc2d9ab46
commit 5cba27652d
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

6
acinclude.m4
Unescape View File

@ -2078,14 +2078,14 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2095,7 +2095,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

2
kexi/3rdparty/kexisql/src/os.c vendored
Unescape View File

@ -1367,7 +1367,7 @@ int sqliteOsReadLock(OsFile *id){
ovlp.Offset = FIRST_LOCKBYTE+1; ovlp.Offset = FIRST_LOCKBYTE+1;
ovlp.OffsetHigh = 0; ovlp.OffsetHigh = 0;
ovlp.hEvent = 0; ovlp.hEvent = 0;
res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY,
0, N_LOCKBYTE, 0, &ovlp); 0, N_LOCKBYTE, 0, &ovlp);
}else{ }else{
res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0); res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0);

2
kexi/3rdparty/kexisql3/src/os_win.c vendored
Unescape View File

@ -615,7 +615,7 @@ static int getReadLock(OsFile *id){
ovlp.Offset = SHARED_FIRST; ovlp.Offset = SHARED_FIRST;
ovlp.OffsetHigh = 0; ovlp.OffsetHigh = 0;
ovlp.hEvent = 0; ovlp.hEvent = 0;
res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp); res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
}else{ }else{
int lk; int lk;
sqlite3Randomness(sizeof(lk), &lk); sqlite3Randomness(sizeof(lk), &lk);

2
kexi/formeditor/tdevelop_plugin/Makefile.am
Unescape View File

@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkformdesigner_kdev_part.la
libkformdesigner_kdev_part_la_SOURCES = kfd_kdev_part.cpp libkformdesigner_kdev_part_la_SOURCES = kfd_kdev_part.cpp
libkformdesigner_kdev_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(VER_INFO) $(all_libraries) libkformdesigner_kdev_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(VER_INFO) $(all_libraries)
libkformdesigner_kdev_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ libkformdesigner_kdev_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-lkinterfacedesigner $(LIB_KFILE) -lkinterfacedesigner $(LIB_TDEFILE)
# this is where the desktop file will go # this is where the desktop file will go
partdesktopdir = $(kde_servicesdir) partdesktopdir = $(kde_servicesdir)

2
kexi/formeditor/test/Makefile.am
Unescape View File

@ -33,7 +33,7 @@ kde_module_LTLIBRARIES = libkformdesigner_part.la
libkformdesigner_part_la_SOURCES = kfd_part.cpp libkformdesigner_part_la_SOURCES = kfd_part.cpp
libkformdesigner_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(VER_INFO) libkformdesigner_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(VER_INFO)
libkformdesigner_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la $(LIB_KFILE) libkformdesigner_part_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la $(LIB_TDEFILE)
# this is where the desktop file will go # this is where the desktop file will go
partdesktopdir = $(kde_servicesdir) partdesktopdir = $(kde_servicesdir)

2
lib/kross/main/Makefile.am
Unescape View File

@ -22,7 +22,7 @@ maininclude_HEADERS = \
libkrossmain_la_LIBADD = \ libkrossmain_la_LIBADD = \
$(LIB_QT) \ $(LIB_QT) \
$(LIB_TDECORE) \ $(LIB_TDECORE) \
$(LIB_KFILE) \ $(LIB_TDEFILE) \
$(LIB_TDEUI) \ $(LIB_TDEUI) \
$(LIB_KNEWSTUFF) \ $(LIB_KNEWSTUFF) \
$(LIB_KROSS_API) $(LIB_KROSS_API)

4
tools/tdefile-plugins/abiword/tdefile_abiword.h
Unescape View File

@ -17,8 +17,8 @@
* *
*/ */
#ifndef __KFILE_ABIWORD_H__ #ifndef __TDEFILE_ABIWORD_H__
#define __KFILE_ABIWORD_H__ #define __TDEFILE_ABIWORD_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h
Unescape View File

@ -17,8 +17,8 @@
* *
*/ */
#ifndef __KFILE_GNUMERIC_H__ #ifndef __TDEFILE_GNUMERIC_H__
#define __KFILE_GNUMERIC_H__ #define __TDEFILE_GNUMERIC_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tools/tdefile-plugins/koffice/tdefile_koffice.h
Unescape View File

@ -17,8 +17,8 @@
* *
*/ */
#ifndef __KFILE_KOFFICE_H__ #ifndef __TDEFILE_KOFFICE_H__
#define __KFILE_KOFFICE_H__ #define __TDEFILE_KOFFICE_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tools/tdefile-plugins/ooo/tdefile_ooo.h
Unescape View File

@ -17,8 +17,8 @@
* *
*/ */
#ifndef __KFILE_OOO_H__ #ifndef __TDEFILE_OOO_H__
#define __KFILE_OOO_H__ #define __TDEFILE_OOO_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>
#include <tqiodevice.h> #include <tqiodevice.h>

Write Preview
Loading…
Cancel
Save