Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-tectonic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
podlesny
dune-tectonic
Commits
d1b197d9
Commit
d1b197d9
authored
13 years ago
by
Elias Pipping
Committed by
Elias Pipping
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Generalise compilation of octave modules
parent
2a3b3af4
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/Makefile.am
+5
-9
5 additions, 9 deletions
src/Makefile.am
src/duneevaluate.mk
+0
-10
0 additions, 10 deletions
src/duneevaluate.mk
src/duneminimise.mk
+0
-10
0 additions, 10 deletions
src/duneminimise.mk
src/octave.mk
+12
-0
12 additions, 0 deletions
src/octave.mk
with
17 additions
and
29 deletions
src/Makefile.am
+
5
−
9
View file @
d1b197d9
...
...
@@ -47,19 +47,15 @@ include $(top_srcdir)/am/global-rules
include
$(top_srcdir)/flymake.mk
## Octave
MKOCTFILE
?=
mkoctfile
OCTAVE
?=
octave
bin_PROGRAMS
=
## Octave
OCTAVE_MODULES
=
duneminimise.oct duneevaluate.oct
octave_modules
:
$(OCTAVE_MODULES)
OCTAVE_MODULES
=
duneminimise duneevaluate
.PHONY
:
run-octave
:
octave_modules
run-octave
:
$(addsuffix .oct
,
$(OCTAVE_MODULES))
$(
OCTAVE
)
--path
$(
abs_builddir
)
--path
$(
abs_srcdir
)
include
$(srcdir)/duneminimise.mk
include
$(srcdir)/duneevaluate.mk
include
$(srcdir)/octave.mk
This diff is collapsed.
Click to expand it.
src/duneevaluate.mk
deleted
100644 → 0
+
0
−
10
View file @
2a3b3af4
bin_PROGRAMS
+=
duneminimise.oct
# this would work if shared libraries were only passed via -L and -l, not directly
#duneminimise_LINK = libtool --tag=CXX --mode link $(MKOCTFILE) $(AM_LDFLAGS) -o $@
duneevaluate.oct
:
duneevaluate.o
$(
MKOCTFILE
)
-o
$@
$<
-ldunecommon
duneevaluate.o
:
duneevaluate.cc duneoctave.hh
$(
MKOCTFILE
)
$(
DEFS
)
$(
AM_CPPFLAGS
)
-c
-o
$@
$<
This diff is collapsed.
Click to expand it.
src/duneminimise.mk
deleted
100644 → 0
+
0
−
10
View file @
2a3b3af4
bin_PROGRAMS
+=
duneminimise.oct
# this would work if shared libraries were only passed via -L and -l, not directly
#duneminimise_LINK = libtool --tag=CXX --mode link $(MKOCTFILE) $(AM_LDFLAGS) -o $@
duneminimise.oct
:
duneminimise.o
$(
MKOCTFILE
)
-o
$@
$<
-ldunecommon
duneminimise.o
:
duneminimise.cc duneoctave.hh
$(
MKOCTFILE
)
$(
DEFS
)
$(
AM_CPPFLAGS
)
-c
-o
$@
$<
This diff is collapsed.
Click to expand it.
src/octave.mk
0 → 100644
+
12
−
0
View file @
d1b197d9
define
OCTFILE_template =
$(1).oct
:
$(1).o
$$(
MKOCTFILE
)
-o
$$
@
$$
<
-ldunecommon
$(1).o
:
$(1).cc duneoctave.hh
$$(
MKOCTFILE
)
$$(
DEFS
)
$$(
AM_CPPFLAGS
)
-c
-o
$$
@
$$
<
endef
$(
foreach
octave_module,
$(
OCTAVE_MODULES
)
,
$(
eval
$(
call OCTFILE_template,
$(
octave_module
))))
CLEANFILES
=
$(
addsuffix .oct,
$(
OCTAVE_MODULES
))
$(
addsuffix .o,
$(
OCTAVE_MODULES
))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment