From 9caaaccc33cafef0329ae4da9e84ad7aa492d61a Mon Sep 17 00:00:00 2001 From: Dariusz Dwornikowski Date: Fri, 9 May 2014 11:57:43 +0200 Subject: [PATCH] Fixes in Makefile.am --- .gitignore | 4 ++++ Makefile.am | 18 +++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 70d9cf3..1d8b588 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ Makefile Makefile.in configure +libtool +ltmain.sh +config.guess +config.sub install-sh missing compile diff --git a/Makefile.am b/Makefile.am index fa2af44..418cb6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,23 +8,15 @@ PARSER_LIBS=@PARSER_LIBS@ SSL_LIBS = -lssl -lcrypto -lz STROPHE_FLAGS = -I$(top_srcdir) -STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) $(SSL_LIBS) +STROPHE_LIBS = -lstrophe $(PARSER_LIBS) $(SSL_LIBS) ## Main build targets -lib_LIBRARIES = libstrophe.a +#lib_LIBRARIES = libstrophe.a lib_LTLIBRARIES = libstrophe.la -libstrophe_a_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_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS) libstrophe_la_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 \ @@ -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 if PARSER_EXPAT -libstrophe_a_SOURCES += src/parser_expat.c +libstrophe_la_SOURCES += src/parser_expat.c else -libstrophe_a_SOURCES += src/parser_libxml2.c +libstrophe_la_SOURCES += src/parser_libxml2.c endif include_HEADERS = strophe.h