Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 32 insertions, 0 deletions

diff --git a/kcontrol/locale/Makefile.am b/kcontrol/locale/Makefile.am
new file mode 100644
index 000000000..8ca082408
--- /dev/null
+++ b/kcontrol/locale/Makefile.am
@@ -0,0 +1,32 @@
+#AM_CPPFLAGS = -DQT_NO_CAST_ASCII -DQT_NO_COMPAT
+
+AM_CPPFLAGS = $(all_includes)
+
+SUBDIRS = default pics
+
+kde_module_LTLIBRARIES = kcm_locale.la
+kcm_locale_la_SOURCES = main.cpp toplevel.cpp kcmlocale.cpp klocalesample.cpp localenum.cpp localemon.cpp localetime.cpp localeother.cpp
+METASOURCES = AUTO
+noinst_HEADERS = toplevel.h kcmlocale.h klocalesample.h localenum.h localemon.h localetime.h localeother.h 
+
+kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+kcm_locale_la_LIBADD = $(LIB_KIO)
+
+# Note: newer glibc (e.g. zonetab version 1.31 (cvs revision 1.22) have more/other data than older ones (e.g. zonetab version 1.28)
+
+# timezones-manual is for adding entried from a zone.tab downloaded from glibc's CVS
+timezones-manual:
+	grep -v '^#' zone.tab | tr '	' ' ' | sed -e "s#  *# #" | cut -d' ' -f3 | sed -e 's,^,i18n(",; s,$$,");,' >> $(srcdir)/TIMEZONES
+	sort -u $(srcdir)/TIMEZONES > t && mv t $(srcdir)/TIMEZONES
+
+timezones:
+	grep -v '^#' /usr/share/zoneinfo/zone.tab | tr '	' ' ' | sed -e "s#  *# #" | cut -d' ' -f3 | sed -e 's,^,i18n(",; s,$$,");,' >> $(srcdir)/TIMEZONES
+	sort -u $(srcdir)/TIMEZONES > t && mv t $(srcdir)/TIMEZONES
+	
+
+messages:
+	$(XGETTEXT) -ktranslate $(kcm_locale_la_SOURCES) -o $(podir)/kcmlocale.pot
+	$(XGETTEXT) TIMEZONES -o $(podir)/../kdelibs/timezones.pot
+
+xdg_apps_DATA = language.desktop
+