projects / scilab.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Add the option --with-vmkit-package to use Debian packages instead of the llvm+vmkit...
[scilab.git] / scilab / modules / core / Makefile.in
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 17c9071..180d6ac 100644 (file)
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -300,8 +300,9 @@ am__v_lt_1 =
 libscicore_la_DEPENDENCIES = libscicore-algo.la
 am__objects_6 = libscicore_la-gw_core.lo libscicore_la-gw_user.lo \
        libscicore_la-gw_user2.lo libscicore_la-sci_type.lo \
-       libscicore_la-sci_getdebuginfo.lo \
-       libscicore_la-sci_readgateway.lo
+       libscicore_la-sci_getdebuginfo.lo libscicore_la-gw_user2.lo \
+       libscicore_la-sci_getvariablesonstack.lo \
+       libscicore_la-sci_readgateway.lo libscicore_la-sci_comp.lo
 am__objects_7 = where.lo
 am__objects_8 = libscicore_la-core_gw.lo \
        libscicore_la-sci_getmodules.lo libscicore_la-sci_clear.lo \
@@ -320,14 +321,6 @@ am__objects_8 = libscicore_la-core_gw.lo \
        libscicore_la-sci_funcprot.lo libscicore_la-sci_mode.lo \
        libscicore_la-sci_typename.lo libscicore_la-sci_where.lo \
        libscicore_la-sci_getmemory.lo
-<<<<<<<
-=======
-       libscicore_la-sci_abort.lo libscicore_la-sci_who.lo \
-       libscicore_la-sci_stacksize.lo libscicore_la-sci_format.lo \
-       libscicore_la-sci_sciargs.lo libscicore_la-sci_ieee.lo \
-       libscicore_la-sci_funcprot.lo \
-       libscicore_la-sci_runASTwithVMKit.lo
->>>>>>>
 am_libscicore_la_OBJECTS = $(am__objects_6) $(am__objects_7) \
        $(am__objects_8)
 libscicore_la_OBJECTS = $(am_libscicore_la_OBJECTS)
@@ -777,14 +770,10 @@ GATEWAY_C_SOURCES = \
        sci_gateway/c/gw_user2.c \
        sci_gateway/c/sci_type.c \
        sci_gateway/c/sci_getdebuginfo.c \
-<<<<<<<
-       sci_gateway/c/sci_readgateway.c
-=======
        sci_gateway/c/gw_user2.c \
        sci_gateway/c/sci_getvariablesonstack.c \
        sci_gateway/c/sci_readgateway.c \
-       sci_gateway/c/sci_comp.c 
->>>>>>>
+       sci_gateway/c/sci_comp.c
 
 GATEWAY_FORTRAN_SOURCES = \
 sci_gateway/fortran/where.f
@@ -821,14 +810,6 @@ GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_typename.cpp \
        sci_gateway/cpp/sci_where.cpp \
        sci_gateway/cpp/sci_getmemory.cpp
-<<<<<<<
-=======
-       sci_gateway/cpp/sci_format.cpp \
-       sci_gateway/cpp/sci_sciargs.cpp \
-       sci_gateway/cpp/sci_ieee.cpp \
-       sci_gateway/cpp/sci_funcprot.cpp \
-       sci_gateway/cpp/sci_runASTwithVMKit.cpp 
->>>>>>>
 
 libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/cpp/ \
@@ -861,7 +842,7 @@ libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/gui/includes/ \
        -I$(top_srcdir)/modules/graphics/includes/ \
        -I$(top_srcdir)/modules/system_env/includes/ $(EIGEN_CPPFLAGS) \
-       $(XML_FLAGS) $(AM_CPPFLAGS) $(am__append_3)
+       $(XML_FLAGS) $(AM_CPPFLAGS) $(VMKIT_ACPPFLAGS) $(am__append_3)
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicore.la
 @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicore-algo.la libscicore.la
 @MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicore-algo.la
@@ -1170,6 +1151,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_banner.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_clear.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_clearglobal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_comp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_error.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_exists.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_exit.Plo@am__quote@
@@ -1181,6 +1163,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_getmodules.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_getos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_getscilabmode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_getvariablesonstack.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_getversion.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_global.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_ieee.Plo@am__quote@
@@ -1190,11 +1173,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_pause.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_quit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_readgateway.Plo@am__quote@
-<<<<<<<
-=======
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_return.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_runASTwithVMKit.Plo@am__quote@
->>>>>>>
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_sciargs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_stacksize.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_type.Plo@am__quote@
@@ -1617,6 +1595,13 @@ libscicore_la-sci_getdebuginfo.lo: sci_gateway/c/sci_getdebuginfo.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_getdebuginfo.lo `test -f 'sci_gateway/c/sci_getdebuginfo.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getdebuginfo.c
 
+libscicore_la-sci_getvariablesonstack.lo: sci_gateway/c/sci_getvariablesonstack.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_getvariablesonstack.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Tpo -c -o libscicore_la-sci_getvariablesonstack.lo `test -f 'sci_gateway/c/sci_getvariablesonstack.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getvariablesonstack.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Tpo $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_getvariablesonstack.c' object='libscicore_la-sci_getvariablesonstack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_getvariablesonstack.lo `test -f 'sci_gateway/c/sci_getvariablesonstack.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getvariablesonstack.c
+
 libscicore_la-sci_readgateway.lo: sci_gateway/c/sci_readgateway.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_readgateway.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_readgateway.Tpo -c -o libscicore_la-sci_readgateway.lo `test -f 'sci_gateway/c/sci_readgateway.c' || echo '$(srcdir)/'`sci_gateway/c/sci_readgateway.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscicore_la-sci_readgateway.Tpo $(DEPDIR)/libscicore_la-sci_readgateway.Plo
@@ -1624,6 +1609,13 @@ libscicore_la-sci_readgateway.lo: sci_gateway/c/sci_readgateway.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_readgateway.lo `test -f 'sci_gateway/c/sci_readgateway.c' || echo '$(srcdir)/'`sci_gateway/c/sci_readgateway.c
 
+libscicore_la-sci_comp.lo: sci_gateway/c/sci_comp.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_comp.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_comp.Tpo -c -o libscicore_la-sci_comp.lo `test -f 'sci_gateway/c/sci_comp.c' || echo '$(srcdir)/'`sci_gateway/c/sci_comp.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscicore_la-sci_comp.Tpo $(DEPDIR)/libscicore_la-sci_comp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_comp.c' object='libscicore_la-sci_comp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_comp.lo `test -f 'sci_gateway/c/sci_comp.c' || echo '$(srcdir)/'`sci_gateway/c/sci_comp.c
+
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -2439,18 +2431,16 @@ uninstall-am: uninstall-libscicore_la_etcDATA \
        uninstall-libscicore_la_sci_gatewayDATA \
        uninstall-libscicore_la_xmlDATA uninstall-pkglibLTLIBRARIES
 
-<<<<<<<
-=======
-libscicore_la-sci_runASTwithVMKit.lo: sci_gateway/cpp/sci_runASTwithVMKit.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscicore_la-sci_runASTwithVMKit.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_runASTwithVMKit.Tpo -c -o libscicore_la-sci_runASTwithVMKit.lo `test -f 'sci_gateway/cpp/sci_runASTwithVMKit.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_runASTwithVMKit.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_runASTwithVMKit.Tpo $(DEPDIR)/libscicore_la-sci_runASTwithVMKit.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_runASTwithVMKit.cpp' object='libscicore_la-sci_runASTwithVMKit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscicore_la-sci_runASTwithVMKit.lo `test -f 'sci_gateway/cpp/sci_runASTwithVMKit.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_runASTwithVMKit.cpp
-
-.f.o:
-       $(F77COMPILE) -c -o $@ $<
->>>>>>>
+src/cpp/storeCommand.cpp \
+src/cpp/banner.cpp \
+src/cpp/with_module.cpp \
+src/cpp/runner.cpp \
+src/cpp/jitter.cpp
+       sci_gateway/cpp/sci_format.cpp \
+       sci_gateway/cpp/sci_sciargs.cpp \
+       sci_gateway/cpp/sci_ieee.cpp \
+       sci_gateway/cpp/sci_funcprot.cpp \
+       sci_gateway/cpp/sci_runASTwithVMKit.cpp
 
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
Scilab official GIT repository