diff options
| author | Stef Walter <stef@memberwebs.com> | 2005-06-07 17:55:24 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2005-06-07 17:55:24 +0000 |
| commit | c386abd496f61f4628446f27b771529699c0ea45 (patch) | |
| tree | 79c7cebf3fe68c593c8170b341be1595d5e34d80 | |
| parent | 5b879255d6b9f489ac268d6b0e499c8b7da913c4 (diff) | |
Fixes to be compatible with newer versions of the autotools.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/configure.in b/configure.in index fe3ace8..2c776d1 100644 --- a/configure.in +++ b/configure.in @@ -46,7 +46,7 @@ CFLAGS="$CFLAGS -I/usr/local/include" AC_LANG_CPLUSPLUS AC_CONFIG_SRCDIR([src/rtfx.cpp]) -AM_CONFIG_HEADER([config.h]) +AM_CONFIG_HEADER(config.h) # Checks for programs. AC_PROG_CC diff --git a/src/Makefile.am b/src/Makefile.am index f561270..e729fb7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,22 @@ +INCLUDES = \ + -I$(srcdir)/../libs/domc/src/ \ + -I$(srcdir)/../libs/libmba/src/ + bin_PROGRAMS = rtfx rtfx_SOURCES = rtfx.cpp levelhandler.cpp levelhandler.h \ reference.h xmlcomposer.cpp xmlcomposer.h xmlcomposehelpers.cpp rtfformatting.h \ xmlcomposehelpers.h rtfparser.cpp rtfparser.h domcxx.h usuals.h utf8.cpp internal.h \ xmlfixups.h xmlfixups.cpp domhelpers.h domhelpers.cpp tags.h + rtfx_LDADD = -ldomc -lmba -rtfx_CXXFLAGS = -I$(srcdir)/../libs/domc/src/ -I$(srcdir)/../libs/libmba/src/ -rtfx_LDFLAGS = -L/usr/local/lib -L$(srcdir)/../libs/libmba/ -L$(srcdir)/../libs/domc/ + +rtfx_LDFLAGS = \ + -L/usr/local/lib \ + -L$(srcdir)/../libs/libmba/ \ + -L$(srcdir)/../libs/domc/ + man_MANS = rtfx.1 EXTRA_DIST = $(man_MANS) |