diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2014-12-04 08:39:48 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2014-12-04 08:39:48 +0100 |
| commit | 96938310335d61b55e076d4b9b562c488f421a59 (patch) | |
| tree | a1035c1f3468e6747e4fb368126734aaf66de383 /Makefile.am | |
| parent | 091dc6c4ac53e59f7700893de712a3b6a1caf9b1 (diff) | |
| parent | 192220c6aeff3c0bfbeb643da41ce239e8c67609 (diff) | |
Merge branch 'narrative'
Conflicts:
src/mainwindow.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 7aa90c6..5d29aaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,27 +11,25 @@ LDADD = $(top_builddir)/lib/libgnu.la @IGNORE_UNUSED_LIBRARIES_CFLAGS@ \ harfatum/src/libharfatum.la src/default_stylesheet.o src_colloquium_SOURCES = src/colloquium.c src/render.c \ - src/mainwindow.c src/presentation.c \ + src/presentation.c \ src/frame.c src/sc_parse.c \ src/slideshow.c src/wrap.c src/sc_interp.c \ src/imagestore.c src/notes.c src/pr_clock.c \ src/inhibit_screensaver.c src/slide_sorter.c \ - src/shape.c + src/shape.c src/sc_editor.c src/narrative_window.c \ + src/slide_window.c INCLUDES = -Iharfatum/src EXTRA_DIST += src/presentation.h src/render.h src/wrap.h \ src/slideshow.h src/sc_parse.h src/sc_interp.h \ src/imagestore.h src/notes.h src/pr_clock.h \ - src/inhibit_screensaver.h src/slide_sorter.h src/shape.h + src/inhibit_screensaver.h src/slide_sorter.h src/shape.h \ + src/sc_editor.h src/slide_window.h src/narrative_window.c src/default_stylesheet.o: src/default_stylesheet.sty ld -r -b binary -o src/default_stylesheet.o src/default_stylesheet.sty -colloquiumdir = $(datadir)/colloquium -colloquium_DATA = data/colloquium.ui -EXTRA_DIST += $(colloquium_DATA) - iconsdir = $(datadir)/icons/hicolor/scalable/apps icons_DATA = data/colloquium.svg EXTRA_DIST += $(icons_DATA) |