diff options
Diffstat (limited to 'navit')
-rw-r--r-- | navit/CMakeLists.txt | 2 | ||||
-rw-r--r-- | navit/support/gettext_intl/CMakeLists.txt (renamed from navit/intl_cmake/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | navit/support/gettext_intl/ChangeLog (renamed from navit/intl_cmake/ChangeLog) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/Makefile.in (renamed from navit/intl_cmake/Makefile.in) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/VERSION (renamed from navit/intl_cmake/VERSION) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/bindtextdom.c (renamed from navit/intl_cmake/bindtextdom.c) | 0 | ||||
-rwxr-xr-x | navit/support/gettext_intl/config.charset (renamed from navit/intl_cmake/config.charset) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/dcgettext.c (renamed from navit/intl_cmake/dcgettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/dcigettext.c (renamed from navit/intl_cmake/dcigettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/dcngettext.c (renamed from navit/intl_cmake/dcngettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/dgettext.c (renamed from navit/intl_cmake/dgettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/dngettext.c (renamed from navit/intl_cmake/dngettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/eval-plural.h (renamed from navit/intl_cmake/eval-plural.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/explodename.c (renamed from navit/intl_cmake/explodename.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/finddomain.c (renamed from navit/intl_cmake/finddomain.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/gettext.c (renamed from navit/intl_cmake/gettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/gettextP.h (renamed from navit/intl_cmake/gettextP.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/gmo.h (renamed from navit/intl_cmake/gmo.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/hash-string.h (renamed from navit/intl_cmake/hash-string.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/intl-compat.c (renamed from navit/intl_cmake/intl-compat.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/l10nflist.c (renamed from navit/intl_cmake/l10nflist.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/libgnuintl.h (renamed from navit/intl_cmake/libgnuintl.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/libgnuintl.h.in (renamed from navit/intl_cmake/libgnuintl.h.in) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/loadinfo.h (renamed from navit/intl_cmake/loadinfo.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/loadmsgcat.c (renamed from navit/intl_cmake/loadmsgcat.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/localcharset.c (renamed from navit/intl_cmake/localcharset.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/localcharset.h (renamed from navit/intl_cmake/localcharset.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/locale.alias (renamed from navit/intl_cmake/locale.alias) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/localealias.c (renamed from navit/intl_cmake/localealias.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/localename.c (renamed from navit/intl_cmake/localename.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/log.c (renamed from navit/intl_cmake/log.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/ngettext.c (renamed from navit/intl_cmake/ngettext.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/os2compat.c (renamed from navit/intl_cmake/os2compat.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/os2compat.h (renamed from navit/intl_cmake/os2compat.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/osdep.c (renamed from navit/intl_cmake/osdep.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/plural-exp.c (renamed from navit/intl_cmake/plural-exp.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/plural-exp.h (renamed from navit/intl_cmake/plural-exp.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/plural.c (renamed from navit/intl_cmake/plural.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/plural.y (renamed from navit/intl_cmake/plural.y) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/printf-args.c (renamed from navit/intl_cmake/printf-args.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/printf-args.h (renamed from navit/intl_cmake/printf-args.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/printf-parse.c (renamed from navit/intl_cmake/printf-parse.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/printf-parse.h (renamed from navit/intl_cmake/printf-parse.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/printf.c (renamed from navit/intl_cmake/printf.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/ref-add.sin (renamed from navit/intl_cmake/ref-add.sin) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/ref-del.sin (renamed from navit/intl_cmake/ref-del.sin) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/relocatable.c (renamed from navit/intl_cmake/relocatable.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/relocatable.h (renamed from navit/intl_cmake/relocatable.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/textdomain.c (renamed from navit/intl_cmake/textdomain.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/vasnprintf.c (renamed from navit/intl_cmake/vasnprintf.c) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/vasnprintf.h (renamed from navit/intl_cmake/vasnprintf.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/vasnwprintf.h (renamed from navit/intl_cmake/vasnwprintf.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/wprintf-parse.h (renamed from navit/intl_cmake/wprintf-parse.h) | 0 | ||||
-rw-r--r-- | navit/support/gettext_intl/xsize.h (renamed from navit/intl_cmake/xsize.h) | 0 |
54 files changed, 3 insertions, 3 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 7314d609..8b6bff73 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -152,7 +152,7 @@ endif() ADD_DEPENDENCIES(${NAVIT_LIBNAME} version) if (USE_LIBGNUINTL AND NOT HAVE_GLIB) - ADD_DEPENDENCIES(support_glib intl_cmake) + ADD_DEPENDENCIES(support_glib support_gettext_intl) endif() diff --git a/navit/intl_cmake/CMakeLists.txt b/navit/support/gettext_intl/CMakeLists.txt index d413a0be..ab74f3f1 100644 --- a/navit/intl_cmake/CMakeLists.txt +++ b/navit/support/gettext_intl/CMakeLists.txt @@ -1,4 +1,4 @@ add_definitions(-DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DLIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\") -supportlib_add_library(intl_cmake bindtextdom.c dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c explodename.c finddomain.c gettext.c intl-compat.c l10nflist.c loadmsgcat.c localcharset.c localealias.c localename.c log.c ngettext.c osdep.c plural-exp.c plural.c printf-args.c printf.c relocatable.c textdomain.c vasnprintf.c) +supportlib_add_library(support_gettext_intl bindtextdom.c dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c explodename.c finddomain.c gettext.c intl-compat.c l10nflist.c loadmsgcat.c localcharset.c localealias.c localename.c log.c ngettext.c osdep.c plural-exp.c plural.c printf-args.c printf.c relocatable.c textdomain.c vasnprintf.c) ADD_CUSTOM_TARGET(libintl.h DEPENDS libgnuintl.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libintl.h) -ADD_DEPENDENCIES(intl_cmake libintl.h) +ADD_DEPENDENCIES(support_gettext_intl libintl.h) diff --git a/navit/intl_cmake/ChangeLog b/navit/support/gettext_intl/ChangeLog index 75129192..75129192 100644 --- a/navit/intl_cmake/ChangeLog +++ b/navit/support/gettext_intl/ChangeLog diff --git a/navit/intl_cmake/Makefile.in b/navit/support/gettext_intl/Makefile.in index 05f15329..05f15329 100644 --- a/navit/intl_cmake/Makefile.in +++ b/navit/support/gettext_intl/Makefile.in diff --git a/navit/intl_cmake/VERSION b/navit/support/gettext_intl/VERSION index b4b846ca..b4b846ca 100644 --- a/navit/intl_cmake/VERSION +++ b/navit/support/gettext_intl/VERSION diff --git a/navit/intl_cmake/bindtextdom.c b/navit/support/gettext_intl/bindtextdom.c index dcdc4008..dcdc4008 100644 --- a/navit/intl_cmake/bindtextdom.c +++ b/navit/support/gettext_intl/bindtextdom.c diff --git a/navit/intl_cmake/config.charset b/navit/support/gettext_intl/config.charset index 43d45fb7..43d45fb7 100755 --- a/navit/intl_cmake/config.charset +++ b/navit/support/gettext_intl/config.charset diff --git a/navit/intl_cmake/dcgettext.c b/navit/support/gettext_intl/dcgettext.c index 850acdee..850acdee 100644 --- a/navit/intl_cmake/dcgettext.c +++ b/navit/support/gettext_intl/dcgettext.c diff --git a/navit/intl_cmake/dcigettext.c b/navit/support/gettext_intl/dcigettext.c index 9d4e3542..9d4e3542 100644 --- a/navit/intl_cmake/dcigettext.c +++ b/navit/support/gettext_intl/dcigettext.c diff --git a/navit/intl_cmake/dcngettext.c b/navit/support/gettext_intl/dcngettext.c index 48a3e09e..48a3e09e 100644 --- a/navit/intl_cmake/dcngettext.c +++ b/navit/support/gettext_intl/dcngettext.c diff --git a/navit/intl_cmake/dgettext.c b/navit/support/gettext_intl/dgettext.c index b64b0f5d..b64b0f5d 100644 --- a/navit/intl_cmake/dgettext.c +++ b/navit/support/gettext_intl/dgettext.c diff --git a/navit/intl_cmake/dngettext.c b/navit/support/gettext_intl/dngettext.c index 7815637f..7815637f 100644 --- a/navit/intl_cmake/dngettext.c +++ b/navit/support/gettext_intl/dngettext.c diff --git a/navit/intl_cmake/eval-plural.h b/navit/support/gettext_intl/eval-plural.h index 01bd5af5..01bd5af5 100644 --- a/navit/intl_cmake/eval-plural.h +++ b/navit/support/gettext_intl/eval-plural.h diff --git a/navit/intl_cmake/explodename.c b/navit/support/gettext_intl/explodename.c index 52c25e72..52c25e72 100644 --- a/navit/intl_cmake/explodename.c +++ b/navit/support/gettext_intl/explodename.c diff --git a/navit/intl_cmake/finddomain.c b/navit/support/gettext_intl/finddomain.c index 4992a8c9..4992a8c9 100644 --- a/navit/intl_cmake/finddomain.c +++ b/navit/support/gettext_intl/finddomain.c diff --git a/navit/intl_cmake/gettext.c b/navit/support/gettext_intl/gettext.c index 92c42faa..92c42faa 100644 --- a/navit/intl_cmake/gettext.c +++ b/navit/support/gettext_intl/gettext.c diff --git a/navit/intl_cmake/gettextP.h b/navit/support/gettext_intl/gettextP.h index ab9cc8c6..ab9cc8c6 100644 --- a/navit/intl_cmake/gettextP.h +++ b/navit/support/gettext_intl/gettextP.h diff --git a/navit/intl_cmake/gmo.h b/navit/support/gettext_intl/gmo.h index e7c9cc14..e7c9cc14 100644 --- a/navit/intl_cmake/gmo.h +++ b/navit/support/gettext_intl/gmo.h diff --git a/navit/intl_cmake/hash-string.h b/navit/support/gettext_intl/hash-string.h index eb3a6ae7..eb3a6ae7 100644 --- a/navit/intl_cmake/hash-string.h +++ b/navit/support/gettext_intl/hash-string.h diff --git a/navit/intl_cmake/intl-compat.c b/navit/support/gettext_intl/intl-compat.c index 96f9d955..96f9d955 100644 --- a/navit/intl_cmake/intl-compat.c +++ b/navit/support/gettext_intl/intl-compat.c diff --git a/navit/intl_cmake/l10nflist.c b/navit/support/gettext_intl/l10nflist.c index 7d4182ad..7d4182ad 100644 --- a/navit/intl_cmake/l10nflist.c +++ b/navit/support/gettext_intl/l10nflist.c diff --git a/navit/intl_cmake/libgnuintl.h b/navit/support/gettext_intl/libgnuintl.h index 87d23451..87d23451 100644 --- a/navit/intl_cmake/libgnuintl.h +++ b/navit/support/gettext_intl/libgnuintl.h diff --git a/navit/intl_cmake/libgnuintl.h.in b/navit/support/gettext_intl/libgnuintl.h.in index 3be7eb99..3be7eb99 100644 --- a/navit/intl_cmake/libgnuintl.h.in +++ b/navit/support/gettext_intl/libgnuintl.h.in diff --git a/navit/intl_cmake/loadinfo.h b/navit/support/gettext_intl/loadinfo.h index 65e5ebd1..65e5ebd1 100644 --- a/navit/intl_cmake/loadinfo.h +++ b/navit/support/gettext_intl/loadinfo.h diff --git a/navit/intl_cmake/loadmsgcat.c b/navit/support/gettext_intl/loadmsgcat.c index 55208667..55208667 100644 --- a/navit/intl_cmake/loadmsgcat.c +++ b/navit/support/gettext_intl/loadmsgcat.c diff --git a/navit/intl_cmake/localcharset.c b/navit/support/gettext_intl/localcharset.c index 4865f103..4865f103 100644 --- a/navit/intl_cmake/localcharset.c +++ b/navit/support/gettext_intl/localcharset.c diff --git a/navit/intl_cmake/localcharset.h b/navit/support/gettext_intl/localcharset.h index 3b137e73..3b137e73 100644 --- a/navit/intl_cmake/localcharset.h +++ b/navit/support/gettext_intl/localcharset.h diff --git a/navit/intl_cmake/locale.alias b/navit/support/gettext_intl/locale.alias index bd6bb256..bd6bb256 100644 --- a/navit/intl_cmake/locale.alias +++ b/navit/support/gettext_intl/locale.alias diff --git a/navit/intl_cmake/localealias.c b/navit/support/gettext_intl/localealias.c index ee27649a..ee27649a 100644 --- a/navit/intl_cmake/localealias.c +++ b/navit/support/gettext_intl/localealias.c diff --git a/navit/intl_cmake/localename.c b/navit/support/gettext_intl/localename.c index 2706b0e4..2706b0e4 100644 --- a/navit/intl_cmake/localename.c +++ b/navit/support/gettext_intl/localename.c diff --git a/navit/intl_cmake/log.c b/navit/support/gettext_intl/log.c index cb6076e8..cb6076e8 100644 --- a/navit/intl_cmake/log.c +++ b/navit/support/gettext_intl/log.c diff --git a/navit/intl_cmake/ngettext.c b/navit/support/gettext_intl/ngettext.c index e73e00c4..e73e00c4 100644 --- a/navit/intl_cmake/ngettext.c +++ b/navit/support/gettext_intl/ngettext.c diff --git a/navit/intl_cmake/os2compat.c b/navit/support/gettext_intl/os2compat.c index c8dc33e7..c8dc33e7 100644 --- a/navit/intl_cmake/os2compat.c +++ b/navit/support/gettext_intl/os2compat.c diff --git a/navit/intl_cmake/os2compat.h b/navit/support/gettext_intl/os2compat.h index 4f74e8c0..4f74e8c0 100644 --- a/navit/intl_cmake/os2compat.h +++ b/navit/support/gettext_intl/os2compat.h diff --git a/navit/intl_cmake/osdep.c b/navit/support/gettext_intl/osdep.c index b3725983..b3725983 100644 --- a/navit/intl_cmake/osdep.c +++ b/navit/support/gettext_intl/osdep.c diff --git a/navit/intl_cmake/plural-exp.c b/navit/support/gettext_intl/plural-exp.c index 8c04e642..8c04e642 100644 --- a/navit/intl_cmake/plural-exp.c +++ b/navit/support/gettext_intl/plural-exp.c diff --git a/navit/intl_cmake/plural-exp.h b/navit/support/gettext_intl/plural-exp.h index 49e2c5bf..49e2c5bf 100644 --- a/navit/intl_cmake/plural-exp.h +++ b/navit/support/gettext_intl/plural-exp.h diff --git a/navit/intl_cmake/plural.c b/navit/support/gettext_intl/plural.c index 89f4b45e..89f4b45e 100644 --- a/navit/intl_cmake/plural.c +++ b/navit/support/gettext_intl/plural.c diff --git a/navit/intl_cmake/plural.y b/navit/support/gettext_intl/plural.y index 4d33bd7c..4d33bd7c 100644 --- a/navit/intl_cmake/plural.y +++ b/navit/support/gettext_intl/plural.y diff --git a/navit/intl_cmake/printf-args.c b/navit/support/gettext_intl/printf-args.c index f6f3219e..f6f3219e 100644 --- a/navit/intl_cmake/printf-args.c +++ b/navit/support/gettext_intl/printf-args.c diff --git a/navit/intl_cmake/printf-args.h b/navit/support/gettext_intl/printf-args.h index f11e64c0..f11e64c0 100644 --- a/navit/intl_cmake/printf-args.h +++ b/navit/support/gettext_intl/printf-args.h diff --git a/navit/intl_cmake/printf-parse.c b/navit/support/gettext_intl/printf-parse.c index d19f903d..d19f903d 100644 --- a/navit/intl_cmake/printf-parse.c +++ b/navit/support/gettext_intl/printf-parse.c diff --git a/navit/intl_cmake/printf-parse.h b/navit/support/gettext_intl/printf-parse.h index 8aec50e2..8aec50e2 100644 --- a/navit/intl_cmake/printf-parse.h +++ b/navit/support/gettext_intl/printf-parse.h diff --git a/navit/intl_cmake/printf.c b/navit/support/gettext_intl/printf.c index 8e584013..8e584013 100644 --- a/navit/intl_cmake/printf.c +++ b/navit/support/gettext_intl/printf.c diff --git a/navit/intl_cmake/ref-add.sin b/navit/support/gettext_intl/ref-add.sin index 167374e3..167374e3 100644 --- a/navit/intl_cmake/ref-add.sin +++ b/navit/support/gettext_intl/ref-add.sin diff --git a/navit/intl_cmake/ref-del.sin b/navit/support/gettext_intl/ref-del.sin index 613cf37f..613cf37f 100644 --- a/navit/intl_cmake/ref-del.sin +++ b/navit/support/gettext_intl/ref-del.sin diff --git a/navit/intl_cmake/relocatable.c b/navit/support/gettext_intl/relocatable.c index b49446f3..b49446f3 100644 --- a/navit/intl_cmake/relocatable.c +++ b/navit/support/gettext_intl/relocatable.c diff --git a/navit/intl_cmake/relocatable.h b/navit/support/gettext_intl/relocatable.h index 48c5b71e..48c5b71e 100644 --- a/navit/intl_cmake/relocatable.h +++ b/navit/support/gettext_intl/relocatable.h diff --git a/navit/intl_cmake/textdomain.c b/navit/support/gettext_intl/textdomain.c index 8745a843..8745a843 100644 --- a/navit/intl_cmake/textdomain.c +++ b/navit/support/gettext_intl/textdomain.c diff --git a/navit/intl_cmake/vasnprintf.c b/navit/support/gettext_intl/vasnprintf.c index 6c201a4e..6c201a4e 100644 --- a/navit/intl_cmake/vasnprintf.c +++ b/navit/support/gettext_intl/vasnprintf.c diff --git a/navit/intl_cmake/vasnprintf.h b/navit/support/gettext_intl/vasnprintf.h index 65f1bc13..65f1bc13 100644 --- a/navit/intl_cmake/vasnprintf.h +++ b/navit/support/gettext_intl/vasnprintf.h diff --git a/navit/intl_cmake/vasnwprintf.h b/navit/support/gettext_intl/vasnwprintf.h index d3cef4cb..d3cef4cb 100644 --- a/navit/intl_cmake/vasnwprintf.h +++ b/navit/support/gettext_intl/vasnwprintf.h diff --git a/navit/intl_cmake/wprintf-parse.h b/navit/support/gettext_intl/wprintf-parse.h index 24a2cfc2..24a2cfc2 100644 --- a/navit/intl_cmake/wprintf-parse.h +++ b/navit/support/gettext_intl/wprintf-parse.h diff --git a/navit/intl_cmake/xsize.h b/navit/support/gettext_intl/xsize.h index f0bf7139..f0bf7139 100644 --- a/navit/intl_cmake/xsize.h +++ b/navit/support/gettext_intl/xsize.h |