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

Rename a few build variables for overall consistency

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 7c6d47908a
commit e4cbbc78e0
15 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -57,7 +57,7 @@ option( BUILD_KAPPTEMPLATE "Build kapptemplate" ${BUILD_ALL} )
option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} ) option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} )
option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} ) option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} )
option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} ) option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} )
option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} ) option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_KIOSLAVE "Build tdeioslave" ${BUILD_ALL} ) option( BUILD_KIOSLAVE "Build tdeioslave" ${BUILD_ALL} )
option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} ) option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} )
option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} ) option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} )
@ -97,7 +97,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPTEMPLATE kapptemplate )
tde_conditional_add_subdirectory( BUILD_KBABEL kbabel ) tde_conditional_add_subdirectory( BUILD_KBABEL kbabel )
tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster ) tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster )
tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin ) tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin )
tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins ) tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_KIOSLAVE tdeioslave ) tde_conditional_add_subdirectory( BUILD_KIOSLAVE tdeioslave )
tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace ) tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace )
tde_conditional_add_subdirectory( BUILD_KOMPARE kompare ) tde_conditional_add_subdirectory( BUILD_KOMPARE kompare )

2
cervisia/Makefile.am
Unescape View File

@ -25,7 +25,7 @@ libcervisiapart_la_SOURCES = updateview.cpp protocolview.cpp protocolview.skel \
entry_status.cpp stringmatcher.cpp cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp \ entry_status.cpp stringmatcher.cpp cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp \
globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp
libcervisiapart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) libcervisiapart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libcervisiapart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KUTILS) \ libcervisiapart_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_KUTILS) \
cvsservice/libcvsservice.la libcervisia.la cvsservice/libcvsservice.la libcervisia.la
libcervisiapart_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h libcervisiapart_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h

2
kapptemplate/existing/app-Makefile.am
Unescape View File

@ -15,7 +15,7 @@ INCLUDES = \$(all_includes)
${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) ${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
# the libraries to link against. # the libraries to link against.
${APP_NAME_LC}_LDADD = \$(LIB_KFILE) ${APP_NAME_LC}_LDADD = \$(LIB_TDEFILE)
# which sources should be compiled for $APP_NAME_LC # which sources should be compiled for $APP_NAME_LC
${APP_NAME_LC}_SOURCES = ${EXISTING_SOURCE} ${APP_NAME_LC}_SOURCES = ${EXISTING_SOURCE}

2
kapptemplate/kapp/app-Makefile.am
Unescape View File

@ -17,7 +17,7 @@ INCLUDES = \$(all_includes)
${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) ${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
# the libraries to link against. # the libraries to link against.
${APP_NAME_LC}_LDADD = \$(LIB_KFILE) -ltdeprint ${APP_NAME_LC}_LDADD = \$(LIB_TDEFILE) -ltdeprint
# which sources should be compiled for $APP_NAME_LC # which sources should be compiled for $APP_NAME_LC
${APP_NAME_LC}_SOURCES = main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}view.cpp \\ ${APP_NAME_LC}_SOURCES = main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}view.cpp \\

2
kapptemplate/kpartapp/app-Makefile.am
Unescape View File

@ -46,7 +46,7 @@ kde_module_LTLIBRARIES = lib${APP_NAME_LC}part.la
# the Part's source, library search path, and link libraries # the Part's source, library search path, and link libraries
lib${APP_NAME_LC}part_la_SOURCES = ${APP_NAME_LC}_part.cpp lib${APP_NAME_LC}part_la_SOURCES = ${APP_NAME_LC}_part.cpp
lib${APP_NAME_LC}part_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries) lib${APP_NAME_LC}part_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries)
lib${APP_NAME_LC}part_la_LIBADD = \$(LIB_KPARTS) \$(LIB_KFILE) lib${APP_NAME_LC}part_la_LIBADD = \$(LIB_KPARTS) \$(LIB_TDEFILE)
# this is where the desktop file will go # this is where the desktop file will go
partdesktopdir = \$(kde_servicesdir) partdesktopdir = \$(kde_servicesdir)

6
kbabel/addons/tdefile-plugins/tdefile_po.h
Unescape View File

@ -29,8 +29,8 @@
*/ */
#ifndef KFILE_PO_H #ifndef TDEFILE_PO_H
#define KFILE_PO_H #define TDEFILE_PO_H
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>
@ -47,4 +47,4 @@ class KPoPlugin : public KFilePlugin
virtual bool readInfo(KFileMetaInfo& info, uint); virtual bool readInfo(KFileMetaInfo& info, uint);
}; };
#endif // KFILE_PO_H #endif // TDEFILE_PO_H

4
kbugbuster/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
if include_kcalresource if include_kcalresource
KRESOURCES_SUBDIR = tderesources TDERESOURCES_SUBDIR = tderesources
LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal
endif endif
INCLUDES= -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(LIBKCAL_INCLUDES) INCLUDES= -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(LIBKCAL_INCLUDES)
SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR) SUBDIRS = backend gui pics $(TDERESOURCES_SUBDIR)
bin_PROGRAMS = kbugbuster bin_PROGRAMS = kbugbuster

2
kompare/komparepart/Makefile.am
Unescape View File

@ -34,7 +34,7 @@ libkomparepart_la_SOURCES = \
komparesaveoptionswidget.cpp komparesaveoptionswidget.cpp
libkomparepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) libkomparepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
libkomparepart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) \ libkomparepart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) \
../libdialogpages/libdialogpages.la \ ../libdialogpages/libdialogpages.la \
../libdiff2/libdiff2.la \ ../libdiff2/libdiff2.la \
../interfaces/libkompareinterface.la ../interfaces/libkompareinterface.la

2
kompare/libdialogpages/Makefile.am
Unescape View File

@ -29,4 +29,4 @@ libdialogpages_la_SOURCES = \
viewpage.cpp viewpage.cpp
libdialogpages_la_LDFLAGS = $(all_libraries) libdialogpages_la_LDFLAGS = $(all_libraries)
libdialogpages_la_LIBADD = $(LIB_KFILE) libdialogpages_la_LIBADD = $(LIB_TDEFILE)

2
kompare/libdiff2/Makefile.am
Unescape View File

@ -33,5 +33,5 @@ libdiff2_la_SOURCES = \
perforceparser.cpp perforceparser.cpp
libdiff2_la_LDFLAGS = $(all_libraries) libdiff2_la_LDFLAGS = $(all_libraries)
libdiff2_la_LIBADD = $(LIB_KFILE) libdiff2_la_LIBADD = $(LIB_TDEFILE)

2
kuiviewer/Makefile.am
Unescape View File

@ -42,7 +42,7 @@ kde_module_LTLIBRARIES = libkuiviewerpart.la quithumbnail.la
# the Part's source, library search path, and link libraries # the Part's source, library search path, and link libraries
libkuiviewerpart_la_SOURCES = kuiviewer_part.cpp libkuiviewerpart_la_SOURCES = kuiviewer_part.cpp
libkuiviewerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) libkuiviewerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkuiviewerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_QUI) libkuiviewerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_QUI)
# this is where the desktop file will go # this is where the desktop file will go
partdesktopdir = $(kde_servicesdir) partdesktopdir = $(kde_servicesdir)

14
scripts/tdesvn-build
Unescape View File

@ -2231,7 +2231,7 @@ DONE
sub get_lock sub get_lock
{ {
my $lockfile = "$ENV{HOME}/.tdesvn-lock"; my $lockfile = "$ENV{HOME}/.tdesvn-lock";
sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL; sysopen LOCTDEFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL;
my $errorCode = $!; # Save for later testing. my $errorCode = $!; # Save for later testing.
# Install signal handlers to ensure that the lockfile gets closed. # Install signal handlers to ensure that the lockfile gets closed.
@ -2298,16 +2298,16 @@ sub get_lock
# twice. # twice.
warning " y[WARNING]: stale tdesvn-build lockfile found, deleting."; warning " y[WARNING]: stale tdesvn-build lockfile found, deleting.";
unlink $lockfile; unlink $lockfile;
sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do sysopen LOCTDEFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do
{ {
print LOCKFILE "$$\n"; print LOCTDEFILE "$$\n";
close LOCKFILE; close LOCTDEFILE;
}; };
return 1; # Hope the sysopen worked. return 1; # Hope the sysopen worked.
} }
print LOCKFILE "$$\n"; print LOCTDEFILE "$$\n";
close LOCKFILE; close LOCTDEFILE;
# Even if we fail it's generally better to allow the script to proceed # Even if we fail it's generally better to allow the script to proceed
# without being a jerk about things, especially as more non-CLI-skilled # without being a jerk about things, especially as more non-CLI-skilled
@ -2320,7 +2320,7 @@ sub close_lock
{ {
my $lockfile = "$ENV{HOME}/.tdesvn-lock"; my $lockfile = "$ENV{HOME}/.tdesvn-lock";
close LOCKFILE; close LOCTDEFILE;
unlink $lockfile; unlink $lockfile;
} }

4
tdefile-plugins/c++/tdefile_cpp.h
Unescape View File

@ -17,8 +17,8 @@
* *
*/ */
#ifndef __KFILE_CPP_H__ #ifndef __TDEFILE_CPP_H__
#define __KFILE_CPP_H__ #define __TDEFILE_CPP_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>
#include <kurl.h> #include <kurl.h>

4
tdefile-plugins/diff/tdefile_diff.h
Unescape View File

@ -15,8 +15,8 @@
** **
***************************************************************************/ ***************************************************************************/
#ifndef __KFILE_PDF_H__ #ifndef __TDEFILE_PDF_H__
#define __KFILE_PDF_H__ #define __TDEFILE_PDF_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tdefile-plugins/ts/tdefile_ts.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save