Mercurial > octave-nkf

comparison octMakefile.in @ 9645:4531741e5236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure tweaks
author John W. Eaton <jwe@octave.org>
date Tue, 15 Sep 2009 13:48:39 -0400
parents 4b94672337d0
children
comparison
equal deleted inserted replaced
9644:080e11f1b0c1 9645:4531741e5236
34 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 34 INSTALL_PROGRAM = @INSTALL_PROGRAM@
35 INSTALL_SCRIPT = @INSTALL_SCRIPT@ 35 INSTALL_SCRIPT = @INSTALL_SCRIPT@
36 INSTALL_DATA = @INSTALL_DATA@ 36 INSTALL_DATA = @INSTALL_DATA@
37 37
38 CONF_DISTFILES = Makefile octMakefile.in Makeconf.in \ 38 CONF_DISTFILES = Makefile octMakefile.in Makeconf.in \
39 configure configure.in config.guess config.sub aclocal.m4 \ 39 configure configure.ac config.guess config.sub aclocal.m4 \
40 acx_blas.m4 acx_lapack.m4 acx_blas_f77_func.m4 \
41 config.h.in install-sh autogen.sh 40 config.h.in install-sh autogen.sh
42 41
43 BUILT_DISTFILES = BUGS INSTALL.OCTAVE 42 BUILT_DISTFILES = BUGS INSTALL.OCTAVE
44 43
45 DISTFILES = $(CONF_DISTFILES) \ 44 DISTFILES = $(CONF_DISTFILES) \
55 54
56 # Subdirectories in which to run `make all'. 55 # Subdirectories in which to run `make all'.
57 INSTALL_SUBDIRS = libcruft liboctave src scripts doc examples 56 INSTALL_SUBDIRS = libcruft liboctave src scripts doc examples
58 57
59 # Subdirectories in which to run `make conf-dist'. 58 # Subdirectories in which to run `make conf-dist'.
60 CONF_DISTSUBDIRS = src 59 CONF_DISTSUBDIRS = src m4
61 60
62 # Subdirectories in which to run `make dist'. 61 # Subdirectories in which to run `make dist'.
63 DISTSUBDIRS = $(sort $(SUBDIRS) test emacs) 62 DISTSUBDIRS = $(sort $(SUBDIRS) test emacs m4)
64 63
65 # Subdirectories in which to run clean targets. 64 # Subdirectories in which to run clean targets.
66 CLEANSUBDIRS = $(DISTSUBDIRS) 65 CLEANSUBDIRS = $(DISTSUBDIRS)
67 66
68 DIRS_TO_MAKE = $(bindir) $(datadir) $(libdir) $(octincludedir)/octave \ 67 DIRS_TO_MAKE = $(bindir) $(datadir) $(libdir) $(octincludedir)/octave \
72 $(localarchlibdir) $(localapiarchlibdir) $(localverarchlibdir) 71 $(localarchlibdir) $(localapiarchlibdir) $(localverarchlibdir)
73 72
74 SHELL_SCRIPTS = octave-bug$(SCRIPTS_EXE_SUFFIX) octave-config$(SCRIPTS_EXE_SUFFIX) \ 73 SHELL_SCRIPTS = octave-bug$(SCRIPTS_EXE_SUFFIX) octave-config$(SCRIPTS_EXE_SUFFIX) \
75 mkoctfile$(SCRIPTS_EXE_SUFFIX) run-octave 74 mkoctfile$(SCRIPTS_EXE_SUFFIX) run-octave
76 75
77 CONFIG_FILES = @ac_config_files@ 76 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
78
79 M4_FILES = $(wildcard *.m4)
80 77
81 all: $(SHELL_SCRIPTS) $(filter-out libcruft liboctave, $(SUBDIRS)) dist-info-files 78 all: $(SHELL_SCRIPTS) $(filter-out libcruft liboctave, $(SUBDIRS)) dist-info-files
82 @echo "" 79 @echo ""
83 @echo "Octave successfully built. Now choose from the following:" 80 @echo "Octave successfully built. Now choose from the following:"
84 @echo "" 81 @echo ""
98 ./config.status $@ 95 ./config.status $@
99 96
100 config.status: configure 97 config.status: configure
101 ./config.status --recheck 98 ./config.status --recheck
102 99
103 configure: configure.in $(M4_FILES) 100 M4_FILES = $(wildcard m4/*.m4)
101
102 configure: configure.ac $(M4_FILES)
104 (cd $(top_srcdir); autoconf --force) 103 (cd $(top_srcdir); autoconf --force)
105 (cd $(top_srcdir); autoheader --force) 104 (cd $(top_srcdir); autoheader --force)
106 105
107 src: liboctave 106 src: liboctave
108 107