summaryrefslogtreecommitdiffstats
path: root/scilab/modules/io
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-04-22 11:44:49 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-04-22 11:44:49 +0200
commit5c886402fbda41409c7cce4157c5cda9fa9f5b05 (patch)
tree10ddaa2e8ae34b159c05b9a4f2aa15678f90836f /scilab/modules/io
parent15098dd94a09b76c93efd72ba739120450950845 (diff)
downloadscilab-5c886402fbda41409c7cce4157c5cda9fa9f5b05.zip
scilab-5c886402fbda41409c7cce4157c5cda9fa9f5b05.tar.gz
fix build on macos
Diffstat (limited to 'scilab/modules/io')
-rw-r--r--scilab/modules/io/Makefile.am6
-rw-r--r--scilab/modules/io/Makefile.in44
2 files changed, 13 insertions, 37 deletions
diff --git a/scilab/modules/io/Makefile.am b/scilab/modules/io/Makefile.am
index 58746ff..5a05873 100644
--- a/scilab/modules/io/Makefile.am
+++ b/scilab/modules/io/Makefile.am
@@ -41,11 +41,6 @@ sci_gateway/fortran/intread.f \
41sci_gateway/fortran/intreadb.f \ 41sci_gateway/fortran/intreadb.f \
42sci_gateway/fortran/intfile.f 42sci_gateway/fortran/intfile.f
43 43
44# Disable optimisation of the file intmgetl.f
45noinst_LTLIBRARIES = libdummy-io.la
46libdummy_io_la_SOURCES =
47libdummy_io_la_FFLAGS = $(FFLAGS:-O%=)
48
49libsciio_la_CFLAGS= -I$(srcdir)/includes/ \ 44libsciio_la_CFLAGS= -I$(srcdir)/includes/ \
50 -I$(srcdir)/src/c/ \ 45 -I$(srcdir)/src/c/ \
51 -I$(top_srcdir)/libs/MALLOC/includes/ \ 46 -I$(top_srcdir)/libs/MALLOC/includes/ \
@@ -89,3 +84,4 @@ libsciio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
89libsciio_la_sci_gateway_DATA = sci_gateway/io_gateway.xml 84libsciio_la_sci_gateway_DATA = sci_gateway/io_gateway.xml
90 85
91include $(top_srcdir)/Makefile.incl.am 86include $(top_srcdir)/Makefile.incl.am
87
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 5a9a009..996bdd3 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -106,10 +106,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
106 "$(DESTDIR)$(libsciio_la_etcdir)" \ 106 "$(DESTDIR)$(libsciio_la_etcdir)" \
107 "$(DESTDIR)$(libsciio_la_rootdir)" \ 107 "$(DESTDIR)$(libsciio_la_rootdir)" \
108 "$(DESTDIR)$(libsciio_la_sci_gatewaydir)" 108 "$(DESTDIR)$(libsciio_la_sci_gatewaydir)"
109LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES) 109LTLIBRARIES = $(pkglib_LTLIBRARIES)
110libdummy_io_la_LIBADD =
111am_libdummy_io_la_OBJECTS =
112libdummy_io_la_OBJECTS = $(am_libdummy_io_la_OBJECTS)
113libsciio_la_DEPENDENCIES = $(top_builddir)/modules/core/libscicore.la \ 110libsciio_la_DEPENDENCIES = $(top_builddir)/modules/core/libscicore.la \
114 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 111 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
115 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 112 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
@@ -160,8 +157,8 @@ F77LD = $(F77)
160F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 157F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
161 --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ 158 --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \
162 $(LDFLAGS) -o $@ 159 $(LDFLAGS) -o $@
163SOURCES = $(libdummy_io_la_SOURCES) $(libsciio_la_SOURCES) 160SOURCES = $(libsciio_la_SOURCES)
164DIST_SOURCES = $(libdummy_io_la_SOURCES) $(libsciio_la_SOURCES) 161DIST_SOURCES = $(libsciio_la_SOURCES)
165DATA = $(libsciio_la_etc_DATA) $(libsciio_la_root_DATA) \ 162DATA = $(libsciio_la_etc_DATA) $(libsciio_la_root_DATA) \
166 $(libsciio_la_sci_gateway_DATA) 163 $(libsciio_la_sci_gateway_DATA)
167ETAGS = etags 164ETAGS = etags
@@ -445,11 +442,6 @@ sci_gateway/fortran/intread.f \
445sci_gateway/fortran/intreadb.f \ 442sci_gateway/fortran/intreadb.f \
446sci_gateway/fortran/intfile.f 443sci_gateway/fortran/intfile.f
447 444
448
449# Disable optimisation of the file intmgetl.f
450noinst_LTLIBRARIES = libdummy-io.la
451libdummy_io_la_SOURCES =
452libdummy_io_la_FFLAGS = $(FFLAGS:-O%=)
453libsciio_la_CFLAGS = -I$(srcdir)/includes/ \ 445libsciio_la_CFLAGS = -I$(srcdir)/includes/ \
454 -I$(srcdir)/src/c/ \ 446 -I$(srcdir)/src/c/ \
455 -I$(top_srcdir)/libs/MALLOC/includes/ \ 447 -I$(top_srcdir)/libs/MALLOC/includes/ \
@@ -582,15 +574,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
582$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 574$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
583 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 575 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
584$(am__aclocal_m4_deps): 576$(am__aclocal_m4_deps):
585
586clean-noinstLTLIBRARIES:
587 -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
588 @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
589 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
590 test "$$dir" != "$$p" || dir=.; \
591 echo "rm -f \"$${dir}/so_locations\""; \
592 rm -f "$${dir}/so_locations"; \
593 done
594install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) 577install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
595 @$(NORMAL_INSTALL) 578 @$(NORMAL_INSTALL)
596 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" 579 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -622,8 +605,6 @@ clean-pkglibLTLIBRARIES:
622 echo "rm -f \"$${dir}/so_locations\""; \ 605 echo "rm -f \"$${dir}/so_locations\""; \
623 rm -f "$${dir}/so_locations"; \ 606 rm -f "$${dir}/so_locations"; \
624 done 607 done
625libdummy-io.la: $(libdummy_io_la_OBJECTS) $(libdummy_io_la_DEPENDENCIES)
626 $(LINK) $(libdummy_io_la_OBJECTS) $(libdummy_io_la_LIBADD) $(LIBS)
627libsciio.la: $(libsciio_la_OBJECTS) $(libsciio_la_DEPENDENCIES) 608libsciio.la: $(libsciio_la_OBJECTS) $(libsciio_la_DEPENDENCIES)
628 $(libsciio_la_LINK) -rpath $(pkglibdir) $(libsciio_la_OBJECTS) $(libsciio_la_LIBADD) $(LIBS) 609 $(libsciio_la_LINK) -rpath $(pkglibdir) $(libsciio_la_OBJECTS) $(libsciio_la_LIBADD) $(LIBS)
629 610
@@ -1060,7 +1041,7 @@ maintainer-clean-generic:
1060clean: clean-am 1041clean: clean-am
1061 1042
1062clean-am: clean-generic clean-libtool clean-local \ 1043clean-am: clean-generic clean-libtool clean-local \
1063 clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am 1044 clean-pkglibLTLIBRARIES mostlyclean-am
1064 1045
1065distclean: distclean-am 1046distclean: distclean-am
1066 -rm -rf ./$(DEPDIR) 1047 -rm -rf ./$(DEPDIR)
@@ -1137,15 +1118,14 @@ uninstall-am: uninstall-libsciio_la_etcDATA \
1137 1118
1138.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ 1119.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
1139 clean clean-generic clean-libtool clean-local \ 1120 clean clean-generic clean-libtool clean-local \
1140 clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \ 1121 clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
1141 distclean distclean-compile distclean-generic \ 1122 distclean-generic distclean-libtool distclean-local \
1142 distclean-libtool distclean-local distclean-tags distdir dvi \ 1123 distclean-tags distdir dvi dvi-am html html-am info info-am \
1143 dvi-am html html-am info info-am install install-am \ 1124 install install-am install-data install-data-am \
1144 install-data install-data-am install-data-local install-dvi \ 1125 install-data-local install-dvi install-dvi-am install-exec \
1145 install-dvi-am install-exec install-exec-am install-html \ 1126 install-exec-am install-html install-html-am \
1146 install-html-am install-html-local install-info \ 1127 install-html-local install-info install-info-am \
1147 install-info-am install-libsciio_la_etcDATA \ 1128 install-libsciio_la_etcDATA install-libsciio_la_rootDATA \
1148 install-libsciio_la_rootDATA \
1149 install-libsciio_la_sci_gatewayDATA install-man install-pdf \ 1129 install-libsciio_la_sci_gatewayDATA install-man install-pdf \
1150 install-pdf-am install-pkglibLTLIBRARIES install-ps \ 1130 install-pdf-am install-pkglibLTLIBRARIES install-ps \
1151 install-ps-am install-strip installcheck installcheck-am \ 1131 install-ps-am install-strip installcheck installcheck-am \