diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-02-20 00:19:44 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-02-22 01:18:05 +0100 |
| commit | 42e8056c59255e366d12a84642398cd47fde7278 (patch) | |
| tree | 0eb41375344e7f2dd1b0c5a60a1b5a261cee6769 | |
| parent | ea3f28cdd021380cb9962a1d7391d6539a44af00 (diff) | |
| download | sciteco-42e8056c59255e366d12a84642398cd47fde7278.tar.gz | |
VPATH build fixes: SciTECO can now be built from a parallel source tree
...which is useful when crosscompiling for MinGW
| -rw-r--r-- | bootstrap.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 19 |
3 files changed, 13 insertions, 11 deletions
diff --git a/bootstrap.am b/bootstrap.am index 2fc6285..f44f945 100644 --- a/bootstrap.am +++ b/bootstrap.am @@ -1,5 +1,5 @@ if BOOTSTRAP -BOOTSTRAP_SCITECO = $(top_srcdir)/src/sciteco-minimal$(EXEEXT) +BOOTSTRAP_SCITECO = @top_builddir@/src/sciteco-minimal$(EXEEXT) else BOOTSTRAP_SCITECO = @SCITECO@ endif diff --git a/configure.ac b/configure.ac index 3ba3e48..ae134c6 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ AC_CHECK_HEADERS([bsd/sys/queue.h]) AM_CONDITIONAL(NEED_COMPAT, [test $ac_cv_header_bsd_sys_queue_h = no]) case $host in -*-*-mingw*) +*-mingw*) AC_CHECK_HEADERS([windows.h], , [ AC_MSG_ERROR([Missing Windows headers!]) ]) @@ -90,7 +90,6 @@ SCINTILLA_PATH=`eval $READLINK -e $SCINTILLA_PATH` AC_SUBST(SCINTILLA_PATH) CPPFLAGS="$CPPFLAGS -I$SCINTILLA_PATH/include -DSCI_LEXER" -LIBS="$LIBS $SCINTILLA_PATH/bin/scintilla.a" AC_ARG_WITH(interface, AS_HELP_STRING([--with-interface=ncurses|pdcurses|gtk], 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 |