summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-29 23:29:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-29 23:29:16 -0600
commit84a108376d7f1654d209c16baa092b84bd0996a4 (patch)
tree63cf33e49a8f982f735758e643a5747ba06f79b4
parent9f89b461343e9bc44df34dfb52629b1a6063a3cf (diff)
downloadtdeadmin-84a108376d7f1654d209c16baa092b84bd0996a4.tar.gz
tdeadmin-84a108376d7f1654d209c16baa092b84bd0996a4.zip
Rename a few build variables for overall consistency
-rw-r--r--kcron/Makefile.am2
-rw-r--r--kdat/Makefile.am2
-rw-r--r--kpackage/Makefile.am2
-rw-r--r--ksysv/Makefile.am2
-rw-r--r--tdefile-plugins/deb/tdefile_deb.h4
-rw-r--r--tdefile-plugins/rpm/tdefile_rpm.h4
6 files changed, 8 insertions, 8 deletions
diff --git a/kcron/Makefile.am b/kcron/Makefile.am
index 441ffa4..d6a90c6 100644
--- a/kcron/Makefile.am
+++ b/kcron/Makefile.am
@@ -102,7 +102,7 @@ kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcron.pot
-kcron_LDADD = $(LIB_KFILE) -ltdeprint
+kcron_LDADD = $(LIB_TDEFILE) -ltdeprint
xdg_apps_DATA = kcron.desktop
diff --git a/kdat/Makefile.am b/kdat/Makefile.am
index e24017d..5d01caa 100644
--- a/kdat/Makefile.am
+++ b/kdat/Makefile.am
@@ -67,7 +67,7 @@ kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(L
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kdat_LDADD = $(LIB_KFILE)
+kdat_LDADD = $(LIB_TDEFILE)
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = \
diff --git a/kpackage/Makefile.am b/kpackage/Makefile.am
index 57d62d3..1a4eb3c 100644
--- a/kpackage/Makefile.am
+++ b/kpackage/Makefile.am
@@ -24,7 +24,7 @@ kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kpackage_LDADD = $(LIB_KFILE) $(LIBINTL) $(LIBZ) $(LIBUTEMPTER)
+kpackage_LDADD = $(LIB_TDEFILE) $(LIBINTL) $(LIBZ) $(LIBUTEMPTER)
INCLUDES = $(all_includes)
diff --git a/ksysv/Makefile.am b/ksysv/Makefile.am
index bb2573a..c1db389 100644
--- a/ksysv/Makefile.am
+++ b/ksysv/Makefile.am
@@ -39,7 +39,7 @@ ksysv_SOURCES = main.cpp \
# the library search path
ksysv_METASOURCES = AUTO
ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-ksysv_LDADD = $(LIB_KFILE) -ltdeprint
+ksysv_LDADD = $(LIB_TDEFILE) -ltdeprint
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = ActionList.h \
diff --git a/tdefile-plugins/deb/tdefile_deb.h b/tdefile-plugins/deb/tdefile_deb.h
index ef6979f..3b8a9ab 100644
--- a/tdefile-plugins/deb/tdefile_deb.h
+++ b/tdefile-plugins/deb/tdefile_deb.h
@@ -17,8 +17,8 @@
*
*/
-#ifndef __KFILE_DEB_H__
-#define __KFILE_DEB_H__
+#ifndef __TDEFILE_DEB_H__
+#define __TDEFILE_DEB_H__
#include <tdefilemetainfo.h>
diff --git a/tdefile-plugins/rpm/tdefile_rpm.h b/tdefile-plugins/rpm/tdefile_rpm.h
index 534650a..028f374 100644
--- a/tdefile-plugins/rpm/tdefile_rpm.h
+++ b/tdefile-plugins/rpm/tdefile_rpm.h
@@ -17,8 +17,8 @@
*
*/
-#ifndef __KFILE_RPM_H__
-#define __KFILE_RPM_H__
+#ifndef __TDEFILE_RPM_H__
+#define __TDEFILE_RPM_H__
#include <tdefilemetainfo.h>