diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rwxr-xr-x | autogen.sh | 18 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| m--------- | harfatum | 0 | ||||
| m--------- | libstorycode | 0 | ||||
| -rw-r--r-- | m4/gnulib-cache.m4 | 3 | ||||
| -rw-r--r-- | src/frame.c | 3 | ||||
| -rw-r--r-- | src/render.c | 3 |
9 files changed, 36 insertions, 13 deletions
@@ -11,9 +11,13 @@ config.status stamp-h1 src/*.o src/.deps +src/.libs src/colloquium src/.dirstamp +tests/.libs +m4 *~ INSTALL build-aux lib +libtool diff --git a/Makefile.am b/Makefile.am index 12e3208..c52dfb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = configure m4/gnulib-cache.m4 -SUBDIRS = lib +SUBDIRS = lib libstorycode harfatum ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = src/colloquium @@ -7,13 +7,14 @@ bin_PROGRAMS = src/colloquium AM_CFLAGS = -Wall AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib \ -I$(top_srcdir)/lib -LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@ +LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@ \ + libstorycode/src/libstorycode.la harfatum/src/libharfatum.la src_colloquium_SOURCES = src/colloquium.c src/render.c \ src/layout.c src/mainwindow.c src/presentation.c \ src/stylesheet.c src/loadsave.c src/frame.c -INCLUDES = "-I$(top_srcdir)/data" +INCLUDES = -Ilibstorycode/src -Iharfatum/src EXTRA_DIST += src/layout.h src/presentation.h src/render.h \ src/stylesheet.h src/loadsave.h @@ -30,8 +31,8 @@ EXTRA_DIST += $(colloquium_DATA) noinst_PROGRAMS = tests/render_test tests/render_test_sc1 TESTS = tests/render_test tests/render_test_sc1 -tests_render_test_SOURCES = tests/render_test.c src/storycode.c src/render.c \ +tests_render_test_SOURCES = tests/render_test.c src/render.c \ src/layout.c src/frame.c -tests_render_test_sc1_SOURCES = tests/render_test_sc1.c src/storycode.c \ +tests_render_test_sc1_SOURCES = tests/render_test_sc1.c \ src/render.c src/layout.c src/frame.c @@ -1,7 +1,15 @@ #!/bin/sh -gnulib-tool --update -aclocal -I m4 -autoconf -autoheader -automake -ac +libtoolize --force --copy \ +&& aclocal -I m4 --force \ +&& autoheader --force \ +&& automake --add-missing --copy --force \ +&& autoconf --force + +pushd libstorycode +./autogen.sh +popd + +pushd harfatum +./autogen.sh +popd diff --git a/configure.ac b/configure.ac index 2118a7d..5dac98b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AM_PROG_CC_C_O AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S -AC_PROG_RANLIB +LT_INIT AM_SILENT_RULES([yes]) AC_HEADER_STDC @@ -57,6 +57,9 @@ PKG_CHECK_MODULES([GDK_pixbuf], [gdk-pixbuf], [], gl_IGNORE_UNUSED_LIBRARIES +LIBHARFATUM_CFLAGS="$CFLAGS -D_GNU_SOURCE $Cairo_CFLAGS" +LIBHARFATUM_LIBS="$LIBS $Cairo_LIBS" +AC_SUBST([LIBHARFATUM_LIBS]) CFLAGS="$CFLAGS $GTK_CFLAGS -D_GNU_SOURCE $libPNG_CFLAGS $Cairo_CFLAGS" CFLAGS="$CFLAGS $GDK_pixbuf_CFLAGS $GDK_pixbuf_2_CFLAGS" @@ -66,4 +69,6 @@ LIBS="$LIBS $GDK_pixbuf_2_LIBS $LDFLAGS" AC_CONFIG_FILES(Makefile lib/Makefile) +AC_CONFIG_FILES(libstorycode/Makefile libstorycode/lib/Makefile) +AC_CONFIG_FILES(harfatum/Makefile harfatum/lib/Makefile) AC_OUTPUT diff --git a/harfatum b/harfatum -Subproject 4f36bdfe85a9832b0acb21bdc6c10410f0810d0 +Subproject c99a93cf7749000fe169b28f872f640ffd4be92 diff --git a/libstorycode b/libstorycode -Subproject 4edc5a791fdb30662f5a37e75fba1ea1821cc2c +Subproject f3e87b96a60085bdd2e29f0318d720c5f90fb44 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index fd17149..acc9a4c 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl lib-ignore strndup +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl lib-ignore strndup # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -43,6 +43,7 @@ gl_DOC_BASE([doc]) gl_TESTS_BASE([tests]) gl_LIB([libgnu]) gl_MAKEFILE_NAME([]) +gl_LIBTOOL gl_MACRO_PREFIX([gl]) gl_PO_DOMAIN([]) gl_WITNESS_C_DOMAIN([]) diff --git a/src/frame.c b/src/frame.c index 75a9810..81edf1d 100644 --- a/src/frame.c +++ b/src/frame.c @@ -27,6 +27,9 @@ #include <assert.h> #include <stdlib.h> +#include <string.h> + +#include <storycode.h> #include "frame.h" diff --git a/src/render.c b/src/render.c index b0c5078..fbd94bd 100644 --- a/src/render.c +++ b/src/render.c @@ -32,7 +32,8 @@ #include <gdk/gdk.h> #include <string.h> -#include "storycode.h" +#include <storycode.h> + #include "stylesheet.h" #include "presentation.h" #include "frame.h" |