make distclean really removes all 90/8490/2
Sylvestre Ledru [Thu, 2 Aug 2012 12:53:34 +0000 (14:53 +0200)]
Change-Id: I5d45d601a8fed823bb812148a2af1ee0539eb88b

scilab/contrib/Makefile.am
scilab/contrib/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/Makefile.modelica.am

index 0169018..f05dfab 100644 (file)
@@ -100,13 +100,63 @@ xcos_toolbox_skeleton/tests/unit_tests/tbx_sum.dia.ref \
 loader.sce
 
 install-data-local:
-       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/; \
-       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/toolbox_skeleton; \
-       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/xcos_toolbox_skeleton; \
-       for file in $(SKELETON_FILES) ; do \
-               filePath=`dirname $(DESTDIR)$(pkgdatadir)/contrib/$$file`; \
-               echo "$(mkinstalldirs) -m 755 $$filePath/"; \
-               $(mkinstalldirs) -m 755 $$filePath/; \
-               echo "$(INSTALL_DATA) $$file $$filePath" ; \
-               $(INSTALL_DATA) "$$file" $$filePath; \
-       done
+    $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/; \
+    $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/toolbox_skeleton; \
+    $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/xcos_toolbox_skeleton; \
+    for file in $(SKELETON_FILES) ; do \
+        filePath=`dirname $(DESTDIR)$(pkgdatadir)/contrib/$$file`; \
+        echo "$(mkinstalldirs) -m 755 $$filePath/"; \
+        $(mkinstalldirs) -m 755 $$filePath/; \
+        echo "$(INSTALL_DATA) $$file $$filePath" ; \
+        $(INSTALL_DATA) "$$file" $$filePath; \
+    done
+
+mostlyclean-local:
+       rm -rf archives \
+       toolbox_skeleton/cleaner.sce \
+       toolbox_skeleton/help/*/master_help.xml \
+       toolbox_skeleton/help/*/scilab_*_help \
+       toolbox_skeleton/jar \
+       toolbox_skeleton/loader.sce \
+       toolbox_skeleton/macros/lib \
+       toolbox_skeleton/macros/names \
+       toolbox_skeleton/sci_gateway/cpp/cleaner.sce \
+       toolbox_skeleton/sci_gateway/cpp/libskeleton_cpp.c \
+       toolbox_skeleton/sci_gateway/cpp/libskeleton_cpp.* \
+       toolbox_skeleton/sci_gateway/cpp/loader.sce \
+       toolbox_skeleton/sci_gateway/c/cleaner.sce \
+       toolbox_skeleton/sci_gateway/cleaner_gateway.sce \
+       toolbox_skeleton/sci_gateway/c/libskeleton_c.c \
+       toolbox_skeleton/sci_gateway/c/libskeleton_c.* \
+       toolbox_skeleton/sci_gateway/c/loader.sce \
+       toolbox_skeleton/sci_gateway/fortran/cleaner.sce \
+       toolbox_skeleton/sci_gateway/fortran/libskeleton_fortran.c \
+       toolbox_skeleton/sci_gateway/fortran/libskeleton_fortran.* \
+       toolbox_skeleton/sci_gateway/fortran/loader.sce \
+       toolbox_skeleton/sci_gateway/loader_gateway.sce \
+       toolbox_skeleton/src/c/cleaner.sce \
+       toolbox_skeleton/src/c/libcsum.* \
+       toolbox_skeleton/src/c/loader.sce \
+       toolbox_skeleton/src/fortran/cleaner.sce \
+       toolbox_skeleton/src/fortran/libfsum.* \
+       toolbox_skeleton/src/fortran/loader.sce \
+       toolbox_skeleton/unloader.sce \
+       xcos_toolbox_skeleton/cleaner.sce \
+       xcos_toolbox_skeleton/help/*/master_help.xml \
+       xcos_toolbox_skeleton/help/*/scilab_*_help \
+       xcos_toolbox_skeleton/jar \
+       xcos_toolbox_skeleton/loader.sce \
+       xcos_toolbox_skeleton/macros/lib \
+       xcos_toolbox_skeleton/macros/names \
+       xcos_toolbox_skeleton/sci_gateway/cleaner.sce \
+       xcos_toolbox_skeleton/sci_gateway/cleaner_gateway.sce \
+       xcos_toolbox_skeleton/sci_gateway/c/lib \
+       xcos_toolbox_skeleton/sci_gateway/c/libskeleton_c.c \
+       xcos_toolbox_skeleton/sci_gateway/c/loader.sce \
+       xcos_toolbox_skeleton/sci_gateway/c/cleaner.sce \
+       xcos_toolbox_skeleton/sci_gateway/c/libxcos_toolbox_skeleton_c.c \
+       xcos_toolbox_skeleton/sci_gateway/c/libxcos_toolbox_skeleton_c.* \
+       xcos_toolbox_skeleton/src/c/cleaner.sce \
+       xcos_toolbox_skeleton/src/c/libxcos_tbx_skel.* \
+       xcos_toolbox_skeleton/src/c/loader.sce \
+       xcos_toolbox_skeleton/unloader.sce
\ No newline at end of file
index 46759f1..e4ac287 100644 (file)
@@ -579,7 +579,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+       mostlyclean-local
 
 pdf: pdf-am
 
@@ -602,21 +603,71 @@ uninstall-am:
        install-pdf install-pdf-am install-ps install-ps-am \
        install-strip installcheck installcheck-am installdirs \
        maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am
+       mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+       pdf-am ps ps-am uninstall uninstall-am
 
 
 install-data-local:
-       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/; \
-       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/toolbox_skeleton; \
-       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/xcos_toolbox_skeleton; \
-       for file in $(SKELETON_FILES) ; do \
-               filePath=`dirname $(DESTDIR)$(pkgdatadir)/contrib/$$file`; \
-               echo "$(mkinstalldirs) -m 755 $$filePath/"; \
-               $(mkinstalldirs) -m 755 $$filePath/; \
-               echo "$(INSTALL_DATA) $$file $$filePath" ; \
-               $(INSTALL_DATA) "$$file" $$filePath; \
-       done
+    $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/; \
+    $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/toolbox_skeleton; \
+    $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/contrib/xcos_toolbox_skeleton; \
+    for file in $(SKELETON_FILES) ; do \
+        filePath=`dirname $(DESTDIR)$(pkgdatadir)/contrib/$$file`; \
+        echo "$(mkinstalldirs) -m 755 $$filePath/"; \
+        $(mkinstalldirs) -m 755 $$filePath/; \
+        echo "$(INSTALL_DATA) $$file $$filePath" ; \
+        $(INSTALL_DATA) "$$file" $$filePath; \
+    done
+
+mostlyclean-local:
+       rm -rf archives \
+       toolbox_skeleton/cleaner.sce \
+       toolbox_skeleton/help/*/master_help.xml \
+       toolbox_skeleton/help/*/scilab_*_help \
+       toolbox_skeleton/jar \
+       toolbox_skeleton/loader.sce \
+       toolbox_skeleton/macros/lib \
+       toolbox_skeleton/macros/names \
+       toolbox_skeleton/sci_gateway/cpp/cleaner.sce \
+       toolbox_skeleton/sci_gateway/cpp/libskeleton_cpp.c \
+       toolbox_skeleton/sci_gateway/cpp/libskeleton_cpp.* \
+       toolbox_skeleton/sci_gateway/cpp/loader.sce \
+       toolbox_skeleton/sci_gateway/c/cleaner.sce \
+       toolbox_skeleton/sci_gateway/cleaner_gateway.sce \
+       toolbox_skeleton/sci_gateway/c/libskeleton_c.c \
+       toolbox_skeleton/sci_gateway/c/libskeleton_c.* \
+       toolbox_skeleton/sci_gateway/c/loader.sce \
+       toolbox_skeleton/sci_gateway/fortran/cleaner.sce \
+       toolbox_skeleton/sci_gateway/fortran/libskeleton_fortran.c \
+       toolbox_skeleton/sci_gateway/fortran/libskeleton_fortran.* \
+       toolbox_skeleton/sci_gateway/fortran/loader.sce \
+       toolbox_skeleton/sci_gateway/loader_gateway.sce \
+       toolbox_skeleton/src/c/cleaner.sce \
+       toolbox_skeleton/src/c/libcsum.* \
+       toolbox_skeleton/src/c/loader.sce \
+       toolbox_skeleton/src/fortran/cleaner.sce \
+       toolbox_skeleton/src/fortran/libfsum.* \
+       toolbox_skeleton/src/fortran/loader.sce \
+       toolbox_skeleton/unloader.sce \
+       xcos_toolbox_skeleton/cleaner.sce \
+       xcos_toolbox_skeleton/help/*/master_help.xml \
+       xcos_toolbox_skeleton/help/*/scilab_*_help \
+       xcos_toolbox_skeleton/jar \
+       xcos_toolbox_skeleton/loader.sce \
+       xcos_toolbox_skeleton/macros/lib \
+       xcos_toolbox_skeleton/macros/names \
+       xcos_toolbox_skeleton/sci_gateway/cleaner.sce \
+       xcos_toolbox_skeleton/sci_gateway/cleaner_gateway.sce \
+       xcos_toolbox_skeleton/sci_gateway/c/lib \
+       xcos_toolbox_skeleton/sci_gateway/c/libskeleton_c.c \
+       xcos_toolbox_skeleton/sci_gateway/c/loader.sce \
+       xcos_toolbox_skeleton/sci_gateway/c/cleaner.sce \
+       xcos_toolbox_skeleton/sci_gateway/c/libxcos_toolbox_skeleton_c.c \
+       xcos_toolbox_skeleton/sci_gateway/c/libxcos_toolbox_skeleton_c.* \
+       xcos_toolbox_skeleton/src/c/cleaner.sce \
+       xcos_toolbox_skeleton/src/c/libxcos_tbx_skel.* \
+       xcos_toolbox_skeleton/src/c/loader.sce \
+       xcos_toolbox_skeleton/unloader.sce
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
index 3d940d4..b2941b7 100644 (file)
@@ -19,7 +19,7 @@ sci_gateway/c/sci_ulink.c \
 sci_gateway/c/sci_c_link.c \
 sci_gateway/c/sci_ilib_verbose.c
 
-GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f 
+GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f
 
 libscidynamic_link_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/output_stream/includes/ \
@@ -89,6 +89,6 @@ src/scripts/missing \
 src/scripts/scicompile.sh
 
 # This is a cache file for the dynamic link (on use)
-CLEANFILES = src/scripts/Makefile.orig
+CLEANFILES = src/scripts/Makefile.orig src/scripts/config.log src/scripts/config.status src/scripts/libtool
 
 include $(top_srcdir)/Makefile.incl.am
index 1b7acf5..12001e6 100644 (file)
@@ -444,7 +444,7 @@ sci_gateway/c/sci_ulink.c \
 sci_gateway/c/sci_c_link.c \
 sci_gateway/c/sci_ilib_verbose.c
 
-GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f 
+GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f
 libscidynamic_link_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
@@ -506,7 +506,7 @@ src/scripts/scicompile.sh
 
 
 # This is a cache file for the dynamic link (on use)
-CLEANFILES = src/scripts/Makefile.orig
+CLEANFILES = src/scripts/Makefile.orig src/scripts/config.log src/scripts/config.status src/scripts/libtool
 
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
index 18e4745..5d72d2e 100644 (file)
@@ -124,5 +124,8 @@ data/pages/homepage-fr_FR.html \
 data/pages/ban-en_US.png \
 data/pages/ban-fr_FR.png
 
+mostlyclean-local:
+       rm -rf web javaHelp html pdf
+
 include $(top_srcdir)/Makefile.incl.am
 
index 75f7942..5334b2f 100644 (file)
@@ -1181,7 +1181,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
+       mostlyclean-libtool mostlyclean-local
 
 pdf: pdf-am
 
@@ -1230,8 +1230,8 @@ uninstall-am: uninstall-libscihelptools_la_binDATA \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am uninstall-libscihelptools_la_binDATA \
+       mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
+       uninstall uninstall-am uninstall-libscihelptools_la_binDATA \
        uninstall-libscihelptools_la_data_configurationDATA \
        uninstall-libscihelptools_la_data_cssDATA \
        uninstall-libscihelptools_la_data_pagesDATA \
@@ -1245,6 +1245,9 @@ uninstall-am: uninstall-libscihelptools_la_binDATA \
        uninstall-pkglibLTLIBRARIES
 
 
+mostlyclean-local:
+       rm -rf web javaHelp html pdf
+
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
        if test -d $(mydatadir)/tests; then \
index 63708b8..dcfee78 100644 (file)
@@ -119,5 +119,6 @@ libscijvm_algo_la_CPPFLAGS = $(libscijvm_la_CPPFLAGS)
 CHECK_SRC= $(libscijvm_la_SOURCES)
 INCLUDE_FLAGS = $(libscijvm_la_CPPFLAGS)
 
+CLEANFILES = etc/jvm_options.xml
 
 include $(top_srcdir)/Makefile.incl.am
index ac07c7d..6351709 100644 (file)
@@ -534,6 +534,7 @@ libscijvm_algo_la_CPPFLAGS = $(libscijvm_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(libscijvm_la_SOURCES)
 INCLUDE_FLAGS = $(libscijvm_la_CPPFLAGS)
+CLEANFILES = etc/jvm_options.xml
 
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
@@ -1125,6 +1126,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
index 95ec67e..5ac9566 100644 (file)
@@ -820,6 +820,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/parser.mli \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/lexer.mli \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/parser.ml \
+@OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/linenum.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/lexer.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(TARGET)
 
index cec6c95..61eb26e 100644 (file)
@@ -212,6 +212,7 @@ CLEANFILES = $(BASE_PATH)/*/*.cmi \
        $(BASE_PATH)/translator/*/parser.mli \
        $(BASE_PATH)/translator/*/lexer.mli \
        $(BASE_PATH)/translator/*/parser.ml \
+       $(BASE_PATH)/translator/*/linenum.ml \
        $(BASE_PATH)/translator/*/lexer.ml \
        $(TARGET)