Finish the replace
Sylvestre Ledru [Tue, 6 Aug 2013 13:39:33 +0000 (15:39 +0200)]
Change-Id: Iafbb4db217f0686a1b4c8becbdd9c0d7582d088e

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

index 10a6070..6bd3bf0 100644 (file)
@@ -224,7 +224,7 @@ libscicore_la_CPPFLAGS = \
 $(EIGEN_CPPFLAGS) \
 $(XML_FLAGS) \
 $(AM_CPPFLAGS) \
-$(VMKIT_ACPPFLAGS)
+$(VMKIT_CPPFLAGS)
 
 # Used by sci_getdebuginfo:
 if TCLTK
index 4205105..2d88b07 100644 (file)
@@ -842,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) $(VMKIT_ACPPFLAGS) $(am__append_3)
+       $(XML_FLAGS) $(AM_CPPFLAGS) $(VMKIT_CPPFLAGS) $(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
index 1ef20aa..9763b4d 100644 (file)
@@ -951,10 +951,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@install-data-local:
 @JAVASCI_FALSE@clean-local:
-@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@install-html-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \