diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:25:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:25:50 -0600 |
| commit | d598bcfeef20243e292a4786b6a0e1ab783ee08d (patch) | |
| tree | 1fcbe7a6cc5bd39f64b9e2dc59e7f583585ad741 | |
| parent | 15971ac66c8eb2bbe275c6b63e3946ba114cd0c8 (diff) | |
| download | smb4k-d598bcfeef20243e292a4786b6a0e1ab783ee08d.tar.gz smb4k-d598bcfeef20243e292a4786b6a0e1ab783ee08d.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/configdlg/Makefile.am | 2 | ||||
| -rw-r--r-- | smb4k/core/smb4tdefileio.h | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 918e5f3..d55f9fa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2087,14 +2087,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(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)") fi ]) diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 0e595c1..203fa65 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -5,7 +5,7 @@ konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \ -L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(KDE_PLUGIN) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) \ + $(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) \ $(LIB_TDEUI) globaladddir = $(kde_datadir)/konqsidebartng/add diff --git a/smb4k/Makefile.am b/smb4k/Makefile.am index 10a0c9a..2d803ba 100644 --- a/smb4k/Makefile.am +++ b/smb4k/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = smb4k smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) + $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT) smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/smb4k/configdlg/Makefile.am b/smb4k/configdlg/Makefile.am index 405392a..3795bfd 100644 --- a/smb4k/configdlg/Makefile.am +++ b/smb4k/configdlg/Makefile.am @@ -9,4 +9,4 @@ libsmb4tdeconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4tdeconfigdialog.cpp smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp libsmb4tdeconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_KFILE) +libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_TDEFILE) diff --git a/smb4k/core/smb4tdefileio.h b/smb4k/core/smb4tdefileio.h index 9da6aae..8a98339 100644 --- a/smb4k/core/smb4tdefileio.h +++ b/smb4k/core/smb4tdefileio.h @@ -23,8 +23,8 @@ * MA 02110-1301 USA * ***************************************************************************/ -#ifndef SMB4KFILEIO_H -#define SMB4KFILEIO_H +#ifndef SMB4TDEFILEIO_H +#define SMB4TDEFILEIO_H #ifdef HAVE_CONFIG_H #include <config.h> |