diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-02-18 22:02:16 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-02-22 01:18:04 +0100 |
| commit | e0a47e8fcd592585030384faf6d42a2bf74f43ad (patch) | |
| tree | ee6fc9af3abb8c16bedbad713d1f1881a2ff637e | |
| parent | 920320374e3c104bf92536eb78bca08db5dbb362 (diff) | |
| download | sciteco-e0a47e8fcd592585030384faf6d42a2bf74f43ad.tar.gz | |
clean up SciTECO bootstrapping by building convenience library
* pkg-config LIBS should be added to $LIBS so that link order is correct
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 52 |
3 files changed, 33 insertions, 27 deletions
@@ -12,6 +12,7 @@ .libs/ *.la *.lo +*.a *.o *.exe Makefile @@ -22,7 +23,6 @@ stamp-* # Generated code /doc/sciteco.1 -/teco.ini /src/gtk-info-popup*.[ch] /src/symbols-*.cpp diff --git a/configure.ac b/configure.ac index f3da0b5..3ba3e48 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ fi PKG_CHECK_MODULES(LIBGLIB, [glib-2.0], [ CFLAGS="$CFLAGS $LIBGLIB_CFLAGS" CXXFLAGS="$CXXFLAGS $LIBGLIB_CFLAGS" - LDFLAGS="$LDFLAGS $LIBGLIB_LIBS" + LIBS="$LIBS $LIBGLIB_LIBS" ]) # Checks for header files. @@ -90,7 +90,7 @@ SCINTILLA_PATH=`eval $READLINK -e $SCINTILLA_PATH` AC_SUBST(SCINTILLA_PATH) CPPFLAGS="$CPPFLAGS -I$SCINTILLA_PATH/include -DSCI_LEXER" -LDFLAGS="$LDFLAGS $SCINTILLA_PATH/bin/scintilla.a" +LIBS="$LIBS $SCINTILLA_PATH/bin/scintilla.a" AC_ARG_WITH(interface, AS_HELP_STRING([--with-interface=ncurses|pdcurses|gtk], @@ -132,7 +132,7 @@ gtk) PKG_CHECK_MODULES(LIBGTK, [gtk+-2.0], [ CFLAGS="$CFLAGS $LIBGTK_CFLAGS" CXXFLAGS="$CXXFLAGS $LIBGTK_CFLAGS" - LDFLAGS="$LDFLAGS $LIBGTK_LIBS" + LIBS="$LIBS $LIBGTK_LIBS" ]) AC_CHECK_PROG(GOB2, gob2, gob2) if [[ x$GOB2 = x ]]; then diff --git a/src/Makefile.am b/src/Makefile.am index 60cb387..787d941 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,42 +12,48 @@ BUILT_SOURCES = symbols-scintilla.cpp symbols-scilexer.cpp EXTRA_DIST = gtk-info-popup.gob \ symbols-extract.tes -if BOOTSTRAP -noinst_PROGRAMS = sciteco-minimal -symbols-scintilla.cpp symbols-scilexer.cpp : sciteco-minimal$(EXEEXT) -endif -sciteco_minimal_SOURCES = main.cpp sciteco.h \ - cmdline.cpp cmdline.h \ - undo.cpp undo.h \ - expressions.cpp expressions.h \ - qregisters.cpp qregisters.h \ - ring.cpp ring.h \ - parser.cpp parser.h \ - search.cpp search.h \ - goto.cpp goto.h \ - rbtree.cpp rbtree.h \ - symbols.cpp symbols.h \ - interface.h -nodist_sciteco_minimal_SOURCES = +noinst_LIBRARIES = libsciteco-base.a +libsciteco_base_a_SOURCES = sciteco.h \ + cmdline.cpp cmdline.h \ + undo.cpp undo.h \ + expressions.cpp expressions.h \ + qregisters.cpp qregisters.h \ + ring.cpp ring.h \ + parser.cpp parser.h \ + search.cpp search.h \ + goto.cpp goto.h \ + rbtree.cpp rbtree.h \ + symbols.cpp symbols.h \ + interface.h +nodist_libsciteco_base_a_SOURCES = if INTERFACE_GTK BUILT_SOURCES += gtk-info-popup.c \ gtk-info-popup.h gtk-info-popup-private.h -sciteco_minimal_SOURCES += interface-gtk.cpp interface-gtk.h -nodist_sciteco_minimal_SOURCES += gtk-info-popup.c +libsciteco_base_a_SOURCES += interface-gtk.cpp interface-gtk.h +nodist_libsciteco_base_a_SOURCES += gtk-info-popup.c else +# else must be NCurses interface + +libsciteco_base_a_SOURCES += interface-ncurses.cpp interface-ncurses.h -sciteco_minimal_SOURCES += interface-ncurses.cpp interface-ncurses.h +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 bin_PROGRAMS = sciteco -sciteco_SOURCES = $(sciteco_minimal_SOURCES) -nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \ - symbols-scintilla.cpp symbols-scilexer.cpp +sciteco_SOURCES = main.cpp +nodist_sciteco_SOURCES = symbols-scintilla.cpp symbols-scilexer.cpp +sciteco_LDADD = libsciteco-base.a CLEANFILES = $(BUILT_SOURCES) |