Call scilab Makefile operations moved in a dedicated file
Sylvestre Ledru [Fri, 22 Jan 2010 14:24:39 +0000 (15:24 +0100)]
scilab/Makefile.am
scilab/Makefile.call_scilab.am [new file with mode: 0644]
scilab/Makefile.in

index a96ff26..baf1faa 100644 (file)
@@ -302,45 +302,4 @@ pkgconfig_DATA = scilab.pc
 
 .NOTPARALLEL: macros doc
 
-CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/
-CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la
-
-# These binaries are built here and not in the call_scilab module because 
-# we do need libscilab.so to exist before building these files
-# To build them, just launch "make check-am"
-# To run them, see the help of call Scilab in particular 
-# "Compile and run with Call Scilab"
-check_PROGRAMS = call_scilab_c_simple call_scilab_c call_scilab_c_getlastjob call_scilab_c_DisableInteractiveMode call_scilab_readwriteboolean call_scilab_readwritecomplexmatrix call_scilab_readwritematrix call_scilab_readwritestring
-
-call_scilab_c_SOURCES = $(top_srcdir)/modules/call_scilab/examples/call_scilab/c/common/myprog.c
-call_scilab_c_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_c_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-
-call_scilab_c_simple_SOURCES = $(top_srcdir)/modules/call_scilab/examples/call_scilab/c/common/simple_call_scilab.c
-call_scilab_c_simple_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_c_simple_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-call_scilab_c_getlastjob_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/GetLastJob.c
-call_scilab_c_getlastjob_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_c_getlastjob_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-call_scilab_c_DisableInteractiveMode_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/DisableInteractiveMode.c
-call_scilab_c_DisableInteractiveMode_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_c_DisableInteractiveMode_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-call_scilab_readwriteboolean_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwriteboolean.c
-call_scilab_readwriteboolean_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_readwriteboolean_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-call_scilab_readwritecomplexmatrix_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix.c
-call_scilab_readwritecomplexmatrix_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_readwritecomplexmatrix_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-call_scilab_readwritematrix_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwritematrix.c
-call_scilab_readwritematrix_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_readwritematrix_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
-
-call_scilab_readwritestring_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwritestring.c
-call_scilab_readwritestring_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
-call_scilab_readwritestring_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+include $(top_srcdir)/Makefile.call_scilab.am
diff --git a/scilab/Makefile.call_scilab.am b/scilab/Makefile.call_scilab.am
new file mode 100644 (file)
index 0000000..b3a3b8b
--- /dev/null
@@ -0,0 +1,53 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru
+# 
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at    
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/
+CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la
+
+# These binaries are built here and not in the call_scilab module because 
+# we do need libscilab.so to exist before building these files
+# To build them, just launch "make check-am"
+# To run them, see the help of call Scilab in particular 
+# "Compile and run with Call Scilab"
+check_PROGRAMS = call_scilab_c_simple call_scilab_c call_scilab_c_getlastjob call_scilab_c_DisableInteractiveMode call_scilab_readwriteboolean call_scilab_readwritecomplexmatrix call_scilab_readwritematrix call_scilab_readwritestring
+
+call_scilab_c_SOURCES = $(top_srcdir)/modules/call_scilab/examples/call_scilab/c/common/myprog.c
+call_scilab_c_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_c_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+
+call_scilab_c_simple_SOURCES = $(top_srcdir)/modules/call_scilab/examples/call_scilab/c/common/simple_call_scilab.c
+call_scilab_c_simple_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_c_simple_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+call_scilab_c_getlastjob_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/GetLastJob.c
+call_scilab_c_getlastjob_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_c_getlastjob_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+call_scilab_c_DisableInteractiveMode_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/DisableInteractiveMode.c
+call_scilab_c_DisableInteractiveMode_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_c_DisableInteractiveMode_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+call_scilab_readwriteboolean_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwriteboolean.c
+call_scilab_readwriteboolean_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_readwriteboolean_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+call_scilab_readwritecomplexmatrix_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix.c
+call_scilab_readwritecomplexmatrix_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_readwritecomplexmatrix_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+call_scilab_readwritematrix_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwritematrix.c
+call_scilab_readwritematrix_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_readwritematrix_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
+
+call_scilab_readwritestring_SOURCES = $(top_srcdir)/modules/call_scilab/examples/basicExamples/readwritestring.c
+call_scilab_readwritestring_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
+call_scilab_readwritestring_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
index f7ec715..1730d9b 100644 (file)
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru
+# 
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at    
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
 
 
 VPATH = @srcdir@
@@ -57,18 +68,11 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT) \
 
 #  The user wants to compile the localization files
 @GENERATE_LOCALIZATION_FILES_TRUE@am__append_3 = localization
-check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \
-       call_scilab_c_getlastjob$(EXEEXT) \
-       call_scilab_c_DisableInteractiveMode$(EXEEXT) \
-       call_scilab_readwriteboolean$(EXEEXT) \
-       call_scilab_readwritecomplexmatrix$(EXEEXT) \
-       call_scilab_readwritematrix$(EXEEXT) \
-       call_scilab_readwritestring$(EXEEXT)
-subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/scilab-lib-doc.properties.in \
        $(srcdir)/scilab-lib.properties.in $(srcdir)/scilab.pc.in \
-       $(top_srcdir)/configure $(top_srcdir)/etc/classpath.xml.in \
+       $(top_srcdir)/Makefile.call_scilab.am $(top_srcdir)/configure \
+       $(top_srcdir)/etc/classpath.xml.in \
        $(top_srcdir)/etc/jvm_options.xml.in \
        $(top_srcdir)/etc/modules.xml.in \
        $(top_srcdir)/modules/core/includes/machine.h.in \
@@ -76,6 +80,14 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        COPYING config/compile config/config.guess config/config.rpath \
        config/config.sub config/depcomp config/install-sh \
        config/ltmain.sh config/missing config/mkinstalldirs
+check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \
+       call_scilab_c_getlastjob$(EXEEXT) \
+       call_scilab_c_DisableInteractiveMode$(EXEEXT) \
+       call_scilab_readwriteboolean$(EXEEXT) \
+       call_scilab_readwritecomplexmatrix$(EXEEXT) \
+       call_scilab_readwritematrix$(EXEEXT) \
+       call_scilab_readwritestring$(EXEEXT)
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
@@ -672,7 +684,7 @@ all: all-recursive
 .SUFFIXES: .c .lo .o .obj
 am--refresh:
        @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.call_scilab.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \