Fix docs and build system.

This commit is contained in:
Jack Moffitt
2012-02-07 22:40:55 -07:00
parent 90d4c54d81
commit 9b50b56dbb
6 changed files with 77 additions and 76 deletions

View File

@@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects
CFLAGS = -g -Wall
builtin_CFLAGS = -I$(top_srcdir)/expat/lib
builtin_LIBS = libexpat.a
PARSER_CFLAGS=@PARSER_CFLAGS@
PARSER_LIBS=@PARSER_LIBS@
@@ -12,11 +9,7 @@ STROPHE_FLAGS = -I$(top_srcdir)
STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) -lssl -lresolv
## Main build targets
if BUILD_EXPAT
lib_LIBRARIES = libstrophe.a libexpat.a
else
lib_LIBRARIES = libstrophe.a
endif
libstrophe_a_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS)
libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \
@@ -30,10 +23,6 @@ else
libstrophe_a_SOURCES += src/parser_libxml2.c
endif
libexpat_a_CFLAGS=-DXML_DTD -DXML_NS -DXML_CONTEXT_BYTES=1024 -DXML_STATIC \
-I$(top_srcdir)/expat/lib
libexpat_a_SOURCES=expat/lib/xmlparse.c expat/lib/xmltok.c expat/lib/xmlrole.c
## Examples
noinst_PROGRAMS = examples/active examples/roster examples/basic examples/bot