Some files were missing
Sylvestre Ledru [Wed, 17 Oct 2007 19:04:40 +0000 (19:04 +0000)]
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/c/setgetlanguage.c

index b5938be..687987d 100644 (file)
@@ -4,10 +4,9 @@
 ##########
 
 LOCALIZATION_C_SOURCES = \
-src/c/InitializeLocalization.c 
-
-#src/c/setgetlanguage.c \
-#src/c/loadsavelanguage.c \
+src/c/InitializeLocalization.c \
+src/c/setgetlanguage.c \
+src/c/loadsavelanguage.c
 #src/c/TerminateLocalization.c
 
 if GUI
@@ -15,11 +14,10 @@ if GUI
 endif
 
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_localization.c
-#sci_gateway/c/sci_setlanguage.c
+GATEWAY_C_SOURCES = sci_gateway/c/gw_localization.c \
+sci_gateway/c/sci_setlanguage.c \
+sci_gateway/c/sci_getlanguage.c
 
-#sci_gateway/c/sci_setlanguage.c \
-#sci_gateway/c/sci_getlanguage.c \
 #sci_gateway/c/sci_getlanguagealias.c \
 #sci_gateway/c/sci_getlanguagestable.c \
 #sci_gateway/c/sci_addtext.c \
index effc699..3ca7771 100644 (file)
@@ -87,8 +87,12 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscilocalization_la_DEPENDENCIES =  \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/libs/hashtable/libscihashtable.la
-am__objects_1 = libscilocalization_la-InitializeLocalization.lo
-am__objects_2 = libscilocalization_la-gw_localization.lo
+am__objects_1 = libscilocalization_la-InitializeLocalization.lo \
+       libscilocalization_la-setgetlanguage.lo \
+       libscilocalization_la-loadsavelanguage.lo
+am__objects_2 = libscilocalization_la-gw_localization.lo \
+       libscilocalization_la-sci_setlanguage.lo \
+       libscilocalization_la-sci_getlanguage.lo
 am_libscilocalization_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscilocalization_la_OBJECTS = $(am_libscilocalization_la_OBJECTS)
 libscilocalization_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -279,19 +283,18 @@ tcldir = @tcldir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 LOCALIZATION_C_SOURCES = \
-src/c/InitializeLocalization.c 
+src/c/InitializeLocalization.c \
+src/c/setgetlanguage.c \
+src/c/loadsavelanguage.c
 
-
-#src/c/setgetlanguage.c \
-#src/c/loadsavelanguage.c \
 #src/c/TerminateLocalization.c
 
 #LOCALIZATION_C_SOURCES += src/c/org_scilab_modules_localization_QueryString.c
-GATEWAY_C_SOURCES = sci_gateway/c/gw_localization.c
-#sci_gateway/c/sci_setlanguage.c
+GATEWAY_C_SOURCES = sci_gateway/c/gw_localization.c \
+sci_gateway/c/sci_setlanguage.c \
+sci_gateway/c/sci_getlanguage.c
+
 
-#sci_gateway/c/sci_setlanguage.c \
-#sci_gateway/c/sci_getlanguage.c \
 #sci_gateway/c/sci_getlanguagealias.c \
 #sci_gateway/c/sci_getlanguagestable.c \
 #sci_gateway/c/sci_addtext.c \
@@ -444,6 +447,10 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-InitializeLocalization.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-gw_localization.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-loadsavelanguage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-sci_getlanguage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-sci_setlanguage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-setgetlanguage.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -473,6 +480,20 @@ libscilocalization_la-InitializeLocalization.lo: src/c/InitializeLocalization.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o libscilocalization_la-InitializeLocalization.lo `test -f 'src/c/InitializeLocalization.c' || echo '$(srcdir)/'`src/c/InitializeLocalization.c
 
+libscilocalization_la-setgetlanguage.lo: src/c/setgetlanguage.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT libscilocalization_la-setgetlanguage.lo -MD -MP -MF $(DEPDIR)/libscilocalization_la-setgetlanguage.Tpo -c -o libscilocalization_la-setgetlanguage.lo `test -f 'src/c/setgetlanguage.c' || echo '$(srcdir)/'`src/c/setgetlanguage.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscilocalization_la-setgetlanguage.Tpo $(DEPDIR)/libscilocalization_la-setgetlanguage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/setgetlanguage.c' object='libscilocalization_la-setgetlanguage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o libscilocalization_la-setgetlanguage.lo `test -f 'src/c/setgetlanguage.c' || echo '$(srcdir)/'`src/c/setgetlanguage.c
+
+libscilocalization_la-loadsavelanguage.lo: src/c/loadsavelanguage.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT libscilocalization_la-loadsavelanguage.lo -MD -MP -MF $(DEPDIR)/libscilocalization_la-loadsavelanguage.Tpo -c -o libscilocalization_la-loadsavelanguage.lo `test -f 'src/c/loadsavelanguage.c' || echo '$(srcdir)/'`src/c/loadsavelanguage.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscilocalization_la-loadsavelanguage.Tpo $(DEPDIR)/libscilocalization_la-loadsavelanguage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/loadsavelanguage.c' object='libscilocalization_la-loadsavelanguage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o libscilocalization_la-loadsavelanguage.lo `test -f 'src/c/loadsavelanguage.c' || echo '$(srcdir)/'`src/c/loadsavelanguage.c
+
 libscilocalization_la-gw_localization.lo: sci_gateway/c/gw_localization.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT libscilocalization_la-gw_localization.lo -MD -MP -MF $(DEPDIR)/libscilocalization_la-gw_localization.Tpo -c -o libscilocalization_la-gw_localization.lo `test -f 'sci_gateway/c/gw_localization.c' || echo '$(srcdir)/'`sci_gateway/c/gw_localization.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscilocalization_la-gw_localization.Tpo $(DEPDIR)/libscilocalization_la-gw_localization.Plo
@@ -480,6 +501,20 @@ libscilocalization_la-gw_localization.lo: sci_gateway/c/gw_localization.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o libscilocalization_la-gw_localization.lo `test -f 'sci_gateway/c/gw_localization.c' || echo '$(srcdir)/'`sci_gateway/c/gw_localization.c
 
+libscilocalization_la-sci_setlanguage.lo: sci_gateway/c/sci_setlanguage.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT libscilocalization_la-sci_setlanguage.lo -MD -MP -MF $(DEPDIR)/libscilocalization_la-sci_setlanguage.Tpo -c -o libscilocalization_la-sci_setlanguage.lo `test -f 'sci_gateway/c/sci_setlanguage.c' || echo '$(srcdir)/'`sci_gateway/c/sci_setlanguage.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscilocalization_la-sci_setlanguage.Tpo $(DEPDIR)/libscilocalization_la-sci_setlanguage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_setlanguage.c' object='libscilocalization_la-sci_setlanguage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o libscilocalization_la-sci_setlanguage.lo `test -f 'sci_gateway/c/sci_setlanguage.c' || echo '$(srcdir)/'`sci_gateway/c/sci_setlanguage.c
+
+libscilocalization_la-sci_getlanguage.lo: sci_gateway/c/sci_getlanguage.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT libscilocalization_la-sci_getlanguage.lo -MD -MP -MF $(DEPDIR)/libscilocalization_la-sci_getlanguage.Tpo -c -o libscilocalization_la-sci_getlanguage.lo `test -f 'sci_gateway/c/sci_getlanguage.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getlanguage.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscilocalization_la-sci_getlanguage.Tpo $(DEPDIR)/libscilocalization_la-sci_getlanguage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_getlanguage.c' object='libscilocalization_la-sci_getlanguage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o libscilocalization_la-sci_getlanguage.lo `test -f 'sci_gateway/c/sci_getlanguage.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getlanguage.c
+
 mostlyclean-libtool:
        -rm -f *.lo
 
index 2e12906..679ce24 100644 (file)
@@ -8,7 +8,6 @@
 #include "MALLOC.h"
 #include "tableslanguages.h"
 #include "loadsavelanguage.h"
-#include "loadhashtableslocalization.h"
 #include "syncexec.h"
 /*-----------------------------------------------------------------------------------*/ 
 static char CURRENTLANGUAGESTRING[LengthAlphacode]=SCILABDEFAULTLANGUAGE;
@@ -47,9 +46,6 @@ BOOL setlanguage(char *lang,BOOL updateHelpIndex, BOOL updateMenus)
                                /* save language pref. */
                                savelanguagepref();
 
-                               /* update hash tables messages , errors , menus */
-                               LoadHashTablesLocalization(lang);
-
                                if (updateMenus)
                                {
                                        /* changes menus : to do after */