aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2013-02-20 00:19:44 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2013-02-22 01:18:05 +0100
commit42e8056c59255e366d12a84642398cd47fde7278 (patch)
tree0eb41375344e7f2dd1b0c5a60a1b5a261cee6769 /src/Makefile.am
parentea3f28cdd021380cb9962a1d7391d6539a44af00 (diff)
downloadsciteco-42e8056c59255e366d12a84642398cd47fde7278.tar.gz
VPATH build fixes: SciTECO can now be built from a parallel source tree
...which is useful when crosscompiling for MinGW
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bd945e1..e3b5848 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,16 +45,17 @@ endif
if BOOTSTRAP
noinst_PROGRAMS = sciteco-minimal
-sciteco_minimal_SOURCES = main.cpp
-sciteco_minimal_LDADD = libsciteco-base.a
-
symbols-scintilla.cpp symbols-scilexer.cpp : sciteco-minimal$(EXEEXT)
endif
+sciteco_minimal_SOURCES = main.cpp
+sciteco_minimal_LDADD = libsciteco-base.a \
+ @SCINTILLA_PATH@/bin/scintilla.a
bin_PROGRAMS = sciteco
-sciteco_SOURCES = main.cpp
-nodist_sciteco_SOURCES = symbols-scintilla.cpp symbols-scilexer.cpp
-sciteco_LDADD = libsciteco-base.a
+sciteco_SOURCES = $(sciteco_minimal_SOURCES)
+nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \
+ symbols-scintilla.cpp symbols-scilexer.cpp
+sciteco_LDADD = $(sciteco_minimal_LDADD)
CLEANFILES = $(BUILT_SOURCES)
@@ -63,8 +64,10 @@ CLEANFILES = $(BUILT_SOURCES)
symbols-scintilla.cpp : @SCINTILLA_PATH@/include/Scintilla.h \
symbols-extract.tes
- $(BOOTSTRAP_SCITECO) -m symbols-extract.tes $< $@ "SCI_" scintilla
+ $(BOOTSTRAP_SCITECO) -m @srcdir@/symbols-extract.tes \
+ $< $@ "SCI_" scintilla
symbols-scilexer.cpp : @SCINTILLA_PATH@/include/SciLexer.h \
symbols-extract.tes
- $(BOOTSTRAP_SCITECO) -m symbols-extract.tes $< $@ "SCLEX_,SCE_" scilexer
+ $(BOOTSTRAP_SCITECO) -m @srcdir@/symbols-extract.tes \
+ $< $@ "SCLEX_,SCE_" scilexer