Mercurial > hg > octave-lyh
annotate libinterp/interpfcn/module.mk @ 15195:2fc554ffbc28
split libinterp from src
* libinterp: New directory. Move all files from src directory here
except Makefile.am, main.cc, main-cli.cc, mkoctfile.in.cc,
mkoctfilr.in.sh, octave-config.in.cc, octave-config.in.sh.
* libinterp/Makefile.am: New file, extracted from src/Makefile.am.
* src/Makefile.am: Delete everything except targets and definitions
needed to build and link main and utility programs.
* Makefile.am (SUBDIRS): Include libinterp in the list.
* autogen.sh: Run config-module.sh in libinterp/dldfcn directory, not
src/dldfcn directory.
* configure.ac (AC_CONFIG_SRCDIR): Use libinterp/octave.cc, not
src/octave.cc.
(DL_LDFLAGS, LIBOCTINTERP): Use libinterp, not src.
(AC_CONFIG_FILES): Include libinterp/Makefile in the list.
* find-docstring-files.sh: Look in libinterp, not src.
* gui/src/Makefile.am (liboctgui_la_CPPFLAGS): Find header files in
libinterp, not src.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 18 Aug 2012 16:23:39 -0400 |
parents | src/interpfcn/module.mk@03381a36f70d |
children | cd8248cc6020 |
rev | line source |
---|---|
15088
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
1 EXTRA_DIST += \ |
15096
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
2 interpfcn/module.mk \ |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
3 interpfcn/defaults.in.h \ |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
4 interpfcn/graphics.in.h |
15088
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
5 |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
6 INTERPFCN_INCLUDES = \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
7 interpfcn/data.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
8 interpfcn/debug.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
9 interpfcn/defun.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
10 interpfcn/dirfns.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
11 interpfcn/error.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
12 interpfcn/file-io.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
13 interpfcn/help.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
14 interpfcn/input.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
15 interpfcn/load-path.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
16 interpfcn/load-save.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
17 interpfcn/ls-oct-ascii.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
18 interpfcn/oct-hist.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
19 interpfcn/pager.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
20 interpfcn/pr-output.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
21 interpfcn/profiler.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
22 interpfcn/sighandlers.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
23 interpfcn/symtab.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
24 interpfcn/sysdep.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
25 interpfcn/toplev.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
26 interpfcn/utils.h \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
27 interpfcn/variables.h |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
28 |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
29 INTERPFCN_SRC = \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
30 interpfcn/data.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
31 interpfcn/debug.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
32 interpfcn/defaults.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
33 interpfcn/defun.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
34 interpfcn/dirfns.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
35 interpfcn/error.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
36 interpfcn/file-io.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
37 interpfcn/graphics.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
38 interpfcn/help.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
39 interpfcn/input.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
40 interpfcn/load-path.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
41 interpfcn/load-save.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
42 interpfcn/ls-oct-ascii.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
43 interpfcn/oct-hist.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
44 interpfcn/pager.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
45 interpfcn/pr-output.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
46 interpfcn/profiler.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
47 interpfcn/sighandlers.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
48 interpfcn/symtab.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
49 interpfcn/sysdep.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
50 interpfcn/toplev.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
51 interpfcn/utils.cc \ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
52 interpfcn/variables.cc |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
53 |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
54 ## defaults.h and graphics.h must depend on Makefile. Calling configure |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
55 ## may change default/config values. However, calling configure will also |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
56 ## regenerate the Makefiles from Makefile.am and trigger the rules below. |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
57 interpfcn/defaults.h: interpfcn/defaults.in.h Makefile |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
58 @$(do_subst_default_vals) |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
59 |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
60 interpfcn/graphics.h: interpfcn/graphics.in.h genprops.awk Makefile |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
61 $(AWK) -f $(srcdir)/genprops.awk $< > $@-t |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
62 mv $@-t $@ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
63 |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
64 interpfcn/graphics-props.cc: interpfcn/graphics.in.h genprops.awk Makefile |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
65 $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
66 mv $@-t $@ |
60ff2cef569d
maint: Move core interpreter files with DEFUNS to interpfcn/ directory
Rik <rik@octave.org>
parents:
diff
changeset
|
67 |
15096
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
68 ## FIXME: Do these rules work correctly after transplant to interpfcn/ dir? |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
69 __fltk_uigetfile__.lo __fltk_uigetfile__.o: \ |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
70 AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS)) |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
71 |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
72 __init_fltk__.lo __init_fltk__.o: \ |
909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents:
15088
diff
changeset
|
73 AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS)) |
15107
03381a36f70d
generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents:
15096
diff
changeset
|
74 |
03381a36f70d
generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents:
15096
diff
changeset
|
75 noinst_LTLIBRARIES += interpfcn/libinterpfcn.la |
03381a36f70d
generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents:
15096
diff
changeset
|
76 |
03381a36f70d
generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents:
15096
diff
changeset
|
77 interpfcn_libinterpfcn_la_SOURCES = $(INTERPFCN_SRC) |