diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-08-23 04:13:15 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-08-23 04:51:55 +0200 |
| commit | ee9cf43587d5fef3a0f6d97ef50b8cf848945bcb (patch) | |
| tree | 4e4bb285120f56c65292dfc9ae33d126bf06ad8e /src | |
| parent | e2c7c11066739cf1141f1d47dc3789a5e82eb9cd (diff) | |
| download | sciteco-ee9cf43587d5fef3a0f6d97ef50b8cf848945bcb.tar.gz | |
fully support out of tree builds
* You no longer have to copy contrib/scintilla, contrib/scinterm and contrib/lexilla
manually to the build directory.
* It turns out, that Scintilla/Lexilla was supporting this since 2016.
Scintilla allows pointing to a source directory (srdir) and Lexilla to a binary directory (DIR_O).
* For Scinterm I opened a pull request in order to add srcdir/basedir variables:
https://github.com/orbitalquark/scinterm/pull/21
* `make distcheck` is therefore now also fixed.
* The FreeBSD package is now allowed to build out of source.
I haven't tested it yet.
* See also https://github.com/ScintillaOrg/lexilla/issues/266
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b9aca8a..306dbe9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,10 +67,9 @@ noinst_PROGRAMS = sciteco-minimal sciteco_minimal_SOURCES = symbols-scintilla.c symbols-scilexer.c : sciteco-minimal$(EXEEXT) endif -sciteco_minimal_LDADD = libsciteco-base.la \ - @SCINTILLA_PATH@/bin/scintilla.a +sciteco_minimal_LDADD = libsciteco-base.la $(LIBSCINTILLA) if LEXILLA -sciteco_minimal_LDADD += @LEXILLA_PATH@/bin/liblexilla.a +sciteco_minimal_LDADD += $(LIBLEXILLA) endif # Scintilla is unfortunately still written in C++, so we must force # Automake to use the C++ linker when linking the binaries. |