Fixes in Makefile.am

This commit is contained in:
Dariusz Dwornikowski
2014-05-09 11:57:43 +02:00
parent ea1a6fda91
commit 9caaaccc33
2 changed files with 9 additions and 13 deletions

4
.gitignore vendored
View File

@@ -1,6 +1,10 @@
Makefile Makefile
Makefile.in Makefile.in
configure configure
libtool
ltmain.sh
config.guess
config.sub
install-sh install-sh
missing missing
compile compile

View File

@@ -8,23 +8,15 @@ PARSER_LIBS=@PARSER_LIBS@
SSL_LIBS = -lssl -lcrypto -lz SSL_LIBS = -lssl -lcrypto -lz
STROPHE_FLAGS = -I$(top_srcdir) STROPHE_FLAGS = -I$(top_srcdir)
STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) $(SSL_LIBS) STROPHE_LIBS = -lstrophe $(PARSER_LIBS) $(SSL_LIBS)
## Main build targets ## Main build targets
lib_LIBRARIES = libstrophe.a #lib_LIBRARIES = libstrophe.a
lib_LTLIBRARIES = libstrophe.la lib_LTLIBRARIES = libstrophe.la
libstrophe_a_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS) libstrophe_la_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS)
libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \
src/event.c src/handler.c src/hash.c \
src/jid.c src/md5.c src/sasl.c src/sha1.c \
src/snprintf.c src/sock.c src/stanza.c src/thread.c \
src/tls_openssl.c src/util.c \
src/common.h src/hash.h src/md5.h src/ostypes.h src/parser.h \
src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h
libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \ libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \
src/event.c src/handler.c src/hash.c \ src/event.c src/handler.c src/hash.c \
src/jid.c src/md5.c src/sasl.c src/sha1.c \ src/jid.c src/md5.c src/sasl.c src/sha1.c \
@@ -34,9 +26,9 @@ libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \
src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h
if PARSER_EXPAT if PARSER_EXPAT
libstrophe_a_SOURCES += src/parser_expat.c libstrophe_la_SOURCES += src/parser_expat.c
else else
libstrophe_a_SOURCES += src/parser_libxml2.c libstrophe_la_SOURCES += src/parser_libxml2.c
endif endif
include_HEADERS = strophe.h include_HEADERS = strophe.h