linux build: include importgui as a fileio Scilab lib 34/21234/2
Clément DAVID [Fri, 17 Jan 2020 16:17:57 +0000 (17:17 +0100)]
Change-Id: Ie0a0f482cf235c815e9efc72f2606c328da1b46d

scilab/modules/core/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/javasci/Makefile.in

index 1b0eedc..e0dab97 100644 (file)
@@ -1006,8 +1006,8 @@ libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/graphics/includes/ \
        -I$(top_srcdir)/modules/hdf5/includes/ \
        -I$(top_srcdir)/modules/fftw/includes/ \
-       -I$(top_srcdir)/modules/ui_data/includes/ $(XML_FLAGS) \
-       $(AM_CPPFLAGS) $(am__append_2)
+       -I$(top_srcdir)/modules/ui_data/includes/ $(HDF5_CFLAGS) \
+       $(XML_FLAGS) $(AM_CPPFLAGS) $(am__append_2)
 @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
index c20c707..75ff67d 100644 (file)
@@ -177,4 +177,7 @@ libscifileio_la_includedir=$(pkgincludedir)
 libscifileio_la_include_HEADERS = includes/getFullFilename.h \
 includes/dynlib_fileio.h
 
+#### fileio : CSV import GUI library
+MACROSDIRSEXT= macros/importgui
+
 include $(top_srcdir)/Makefile.incl.am
index a2ef346..e732383 100644 (file)
@@ -933,6 +933,9 @@ libscifileio_la_include_HEADERS = includes/getFullFilename.h \
 includes/dynlib_fileio.h
 
 
+#### fileio : CSV import GUI library
+MACROSDIRSEXT = macros/importgui
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
index 012718d..a206364 100644 (file)
@@ -1035,10 +1035,10 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@install-html-local:
-@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \