Skip to content

Commit d92b0cb

Browse files
committed
- Build omedit & omnotebook from root project.
1 parent 068ea29 commit d92b0cb

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ config.status
88
config.sub
99
configure
1010
install-sh
11+
.metadata/

Makefile.omdev.mingw

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,29 @@ defaultMakefileTarget = Makefile.omdev.mingw
22
REALPATH = $(realpath .)
33
OMBUILDDIR=$(REALPATH)/build
44

5-
all: omc omc-diff omlibrary-core
5+
.PHONY: omc omc-diff omlibrary-core omplot omedit omnotebook
66

77
omc:
88
$(MAKE) -f $(defaultMakefileTarget) -C OMCompiler OMBUILDDIR=$(OMBUILDDIR)
99

1010
omc-diff: omc
1111
$(MAKE) -C testsuite/ -f Makefile omc-diff OMBUILDDIR=$(OMBUILDDIR)
1212

13-
omplot:
14-
$(MAKE) -f $(defaultMakefileTarget) -C OMPlot OMBUILDDIR=$(OMBUILDDIR)
15-
1613
omlibrary-core:
1714
$(MAKE) -C libraries BUILD_DIR=$(OMBUILDDIR)/lib/omlibrary core
15+
1816
omlibrary-all:
1917
$(MAKE) -C libraries BUILD_DIR=$(OMBUILDDIR)/lib/omlibrary all
20-
18+
19+
omplot:
20+
$(MAKE) -C OMPlot -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)
21+
22+
omedit: omplot
23+
$(MAKE) -f $(defaultMakefileTarget) -C OMEdit OMBUILDDIR=$(OMBUILDDIR)
24+
25+
omnotebook: omplot
26+
$(MAKE) -f $(defaultMakefileTarget) -C OMNotebook/OMNotebook/OMNotebookGUI OMBUILDDIR=$(OMBUILDDIR)
27+
2128
clean:
2229
$(MAKE) -f $(defaultMakefileTarget) -C OMCompiler clean OMBUILDDIR=$(OMBUILDDIR)
2330
test ! -d $(OMBUILDDIR) || rm -rf $(OMBUILDDIR)

0 commit comments

Comments
 (0)