diff options
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | fileplugin/Makefile.am | 2 | ||||
| -rw-r--r-- | kbarcode/Makefile.am | 4 | ||||
| -rw-r--r-- | kbarcode/tdeactionmap.h | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fa43fa0..a4822fb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/fileplugin/Makefile.am b/fileplugin/Makefile.am index 12e5903..4abb9cc 100644 --- a/fileplugin/Makefile.am +++ b/fileplugin/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdefile_kbarcode.la tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries) -tdefile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE) +tdefile_kbarcode_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDECORE) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am index a6aafcc..81e8894 100644 --- a/kbarcode/Makefile.am +++ b/kbarcode/Makefile.am @@ -19,8 +19,8 @@ bin_PROGRAMS = kbarcode # the application source, library search path, and link libraries -kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kbarcode_LDADD = $(LIB_TDEABC) $(LIB_KSPELL) $(LIB_TDEPRINT) \ +kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbarcode_LDADD = $(LIB_TDEABC) $(LIB_TDESPELL) $(LIB_TDEPRINT) \ $(LIB_TDEUI) -lkjs -lpcre noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h \ diff --git a/kbarcode/tdeactionmap.h b/kbarcode/tdeactionmap.h index c0be7ec..023647f 100644 --- a/kbarcode/tdeactionmap.h +++ b/kbarcode/tdeactionmap.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef _KACTION_MAP_H_ -#define _KACTION_MAP_H_ +#ifndef _TDEACTION_MAP_H_ +#define _TDEACTION_MAP_H_ #include <tqwidget.h> #include <tdeversion.h> @@ -99,4 +99,4 @@ class TDEActionMap : public TQWidget { bool m_grayOutItems; }; -#endif // _KACTION_MAP_H_ +#endif // _TDEACTION_MAP_H_ |