Automatically update admin submodule and copy sustem libtool files before first build

Fix FTBFS in many TDE sample projects
Place TDE sample projects in a TDE category instead of a KDE category

4 files changed, 9 insertions, 9 deletions

diff --git a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
index d9e23857..3f61af61 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
+++ b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
@@ -1,4 +1,4 @@
-# KDE Config File
+# TDE Config File
 [General]
 Name=KOffice Part
 Name[br]=Perzh KOffice
@@ -28,7 +28,7 @@ Name[tr]=KOffice Bileşeni
 Name[zh_CN]=KOffice 部件
 Name[zh_TW]=KOffice 元件
 Icon=kopart.png
-Category=C++/KDE
+Category=C++/TDE
 Comment=Generates a framework for a full KOffice Application.
 Comment[ca]=Genera una infraestructura per a una completa aplicació de KOffice.
 Comment[da]=Genererer et skelet for et fuldstændigt KOffice-program.
@@ -210,7 +210,7 @@ Comment[et]=KOffice'i komponent loodi asukohta %{dest}
 Comment[eu]=KOffice zati bat sortu da hemen: %{dest}
 Comment[fa]=یک جزء KOffice در %{dest} ایجاد شد
 Comment[fr]=Un composant KOffice a été créé dans %{dest}
-Comment[ga]=Cruthaíodh páirt KDE i %{dest}
+Comment[ga]=Cruthaíodh páirt TDE i %{dest}
 Comment[gl]=Creouse unha 'part' para KOffice en %{dest}
 Comment[hu]=Létrejött egy KOffice-objektum itt: %{dest}
 Comment[it]=È stata creata una part di KOffice in %{dest}
diff --git a/languages/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.tdevelop
index c01c17a2..e3b6cc3f 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop
+++ b/languages/cpp/app_templates/kofficepart/kopart.tdevelop
@@ -4,13 +4,13 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevKDEAutoProject</projectmanagement>
+  <projectmanagement>KDevTDEAutoProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <keywords>
    <keyword>C++</keyword>
    <keyword>Code</keyword>
    <keyword>Qt</keyword>
-   <keyword>KDE</keyword>
+   <keyword>TDE</keyword>
    <keyword>kioslave</keyword>
   </keywords>
  </general>
diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am
index aad464bb..f4405b57 100644
--- a/languages/cpp/app_templates/kofficepart/src-Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am
@@ -5,19 +5,19 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
 lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp \
 	%{APPNAMELC}_view.cpp %{APPNAMELC}_factory.cpp
-lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN)
+lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 lib%{APPNAMELC}part_la_LIBADD = -lkofficeui
 
 ## The tdeinit loadable module
 lib_LTLIBRARIES = %{APPNAMELC}.la
 %{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
-%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
+%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 %{APPNAMELC}_la_LIBADD = -lkofficecore
 
 ## The executable
 bin_PROGRAMS = %{APPNAMELC}
 %{APPNAMELC}_SOURCES = dummy.cpp
-%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 %{APPNAMELC}_LDADD = %{APPNAMELC}.la
 
 dummy.cpp:
diff --git a/languages/cpp/app_templates/kofficepart/tde-configure.in.in b/languages/cpp/app_templates/kofficepart/tde-configure.in.in
index 3ba8fc32..fd8b3142 100644
--- a/languages/cpp/app_templates/kofficepart/tde-configure.in.in
+++ b/languages/cpp/app_templates/kofficepart/tde-configure.in.in
@@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE(kotest, 0.1)
 AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h paths.h)
 KDE_CHECK_KIMGIO
 AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
+AC_CHECK_TDEMAXPATHLEN
 
 dnl AC_DEFINE(USE_QFD, 1, [Define if you prefer the Qt provided file dialog])
 KWMF_INCLUDES='-I$(TDEDIR)/lib/kwmf -I$(TDEDIR)/lib/kwmf'