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 /src/Makefile.am | |
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
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 52 |
1 files changed, 29 insertions, 23 deletions
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) |