update makefile
Allan Cornet [Sat, 9 Jun 2007 06:36:04 +0000 (06:36 +0000)]
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in

index a0cc32b..1a1d5b4 100644 (file)
@@ -13,7 +13,7 @@ src/c/loadhashtableslocalization.c \
 src/c/TerminateLocalization.c
 
 if WITH_JAVA
-LOCALIZATION_C_SOURCES += org_scilab_modules_localization_QueryString.c
+LOCALIZATION_C_SOURCES += src/c/org_scilab_modules_localization_QueryString.c
 endif
 
 
index 8193d00..679f237 100644 (file)
@@ -47,6 +47,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@WITH_JAVA_TRUE@am__append_1 = src/c/org_scilab_modules_localization_QueryString.c
 DIST_COMMON = $(libscilocalization_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
@@ -82,15 +83,31 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscilocalization_la_DEPENDENCIES =  \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/libs/hashtable/libscihashtable.la
-am__objects_1 = libscilocalization_la-hashtable_localization.lo \
+am__libscilocalization_la_SOURCES_DIST =  \
+       src/c/hashtable_localization.c src/c/localization.c \
+       src/c/setgetlanguage.c src/c/InitializeLocalization.c \
+       src/c/loadsavelanguage.c src/c/getentrieshashtable.c \
+       src/c/loadhashtableslocalization.c \
+       src/c/TerminateLocalization.c \
+       src/c/org_scilab_modules_localization_QueryString.c \
+       sci_gateway/c/gw_localization.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 sci_gateway/c/sci_removetext.c \
+       sci_gateway/c/sci_gettext.c
+@WITH_JAVA_TRUE@am__objects_1 = libscilocalization_la-org_scilab_modules_localization_QueryString.lo
+am__objects_2 = libscilocalization_la-hashtable_localization.lo \
        libscilocalization_la-localization.lo \
        libscilocalization_la-setgetlanguage.lo \
        libscilocalization_la-InitializeLocalization.lo \
        libscilocalization_la-loadsavelanguage.lo \
        libscilocalization_la-getentrieshashtable.lo \
        libscilocalization_la-loadhashtableslocalization.lo \
-       libscilocalization_la-TerminateLocalization.lo
-am__objects_2 = libscilocalization_la-gw_localization.lo \
+       libscilocalization_la-TerminateLocalization.lo \
+       $(am__objects_1)
+am__objects_3 = libscilocalization_la-gw_localization.lo \
        libscilocalization_la-sci_setlanguage.lo \
        libscilocalization_la-sci_getlanguage.lo \
        libscilocalization_la-sci_getlanguagealias.lo \
@@ -98,7 +115,7 @@ am__objects_2 = libscilocalization_la-gw_localization.lo \
        libscilocalization_la-sci_addtext.lo \
        libscilocalization_la-sci_removetext.lo \
        libscilocalization_la-sci_gettext.lo
-am_libscilocalization_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+am_libscilocalization_la_OBJECTS = $(am__objects_2) $(am__objects_3)
 libscilocalization_la_OBJECTS = $(am_libscilocalization_la_OBJECTS)
 libscilocalization_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -117,7 +134,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(libscilocalization_la_SOURCES)
-DIST_SOURCES = $(libscilocalization_la_SOURCES)
+DIST_SOURCES = $(am__libscilocalization_la_SOURCES_DIST)
 libscilocalization_la_etcDATA_INSTALL = $(INSTALL_DATA)
 libscilocalization_la_rootDATA_INSTALL = $(INSTALL_DATA)
 libscilocalization_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA)
@@ -280,14 +297,10 @@ tcldir = @tcldir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 LOCALIZATION_C_SOURCES = src/c/hashtable_localization.c \
-src/c/localization.c \
-src/c/setgetlanguage.c \
-src/c/InitializeLocalization.c \
-src/c/loadsavelanguage.c \
-src/c/getentrieshashtable.c \
-src/c/loadhashtableslocalization.c \
-src/c/TerminateLocalization.c
-
+       src/c/localization.c src/c/setgetlanguage.c \
+       src/c/InitializeLocalization.c src/c/loadsavelanguage.c \
+       src/c/getentrieshashtable.c src/c/loadhashtableslocalization.c \
+       src/c/TerminateLocalization.c $(am__append_1)
 GATEWAY_C_SOURCES = sci_gateway/c/gw_localization.c \
 sci_gateway/c/sci_setlanguage.c \
 sci_gateway/c/sci_getlanguage.c \
@@ -297,8 +310,8 @@ sci_gateway/c/sci_addtext.c \
 sci_gateway/c/sci_removetext.c \
 sci_gateway/c/sci_gettext.c
 
-libscilocalization_la_CFLAGS = -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/libs/hashtable/ $(XML_FLAGS)
-libscilocalization_la_LDFLAGS = $(XML_LIBS)
+libscilocalization_la_CFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/libs/hashtable/ $(XML_FLAGS)
+libscilocalization_la_LDFLAGS = $(JAVA_JNI_LIBS) $(XML_LIBS)
 pkglib_LTLIBRARIES = libscilocalization.la
 libscilocalization_la_SOURCES = $(LOCALIZATION_C_SOURCES) $(GATEWAY_C_SOURCES)
 libscilocalization_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
@@ -325,6 +338,7 @@ libscilocalization_la_includedir = $(pkgincludedir)/localization
 libscilocalization_la_include_HEADERS = includes/localization.h \
 includes/gw_localization.h
 
+@WITH_JAVA_TRUE@USEANT = 1
 
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
@@ -446,6 +460,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-loadhashtableslocalization.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-localization.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-org_scilab_modules_localization_QueryString.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscilocalization_la-sci_addtext.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_getlanguagealias.Plo@am__quote@
@@ -532,6 +547,13 @@ libscilocalization_la-TerminateLocalization.lo: src/c/TerminateLocalization.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-TerminateLocalization.lo `test -f 'src/c/TerminateLocalization.c' || echo '$(srcdir)/'`src/c/TerminateLocalization.c
 
+libscilocalization_la-org_scilab_modules_localization_QueryString.lo: src/c/org_scilab_modules_localization_QueryString.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-org_scilab_modules_localization_QueryString.lo -MD -MP -MF $(DEPDIR)/libscilocalization_la-org_scilab_modules_localization_QueryString.Tpo -c -o libscilocalization_la-org_scilab_modules_localization_QueryString.lo `test -f 'src/c/org_scilab_modules_localization_QueryString.c' || echo '$(srcdir)/'`src/c/org_scilab_modules_localization_QueryString.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscilocalization_la-org_scilab_modules_localization_QueryString.Tpo $(DEPDIR)/libscilocalization_la-org_scilab_modules_localization_QueryString.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/org_scilab_modules_localization_QueryString.c' object='libscilocalization_la-org_scilab_modules_localization_QueryString.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-org_scilab_modules_localization_QueryString.lo `test -f 'src/c/org_scilab_modules_localization_QueryString.c' || echo '$(srcdir)/'`src/c/org_scilab_modules_localization_QueryString.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