Add libaec.la to libsz.la

diff --git a/src/Makefile.am b/src/Makefile.am
index ae843a4..791983d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,15 @@
-lib_LTLIBRARIES = libsz-0.0.la libaec-0.0.la
-libaec_0_0_la_SOURCES = encode.c encode_accessors.c decode.c encode.h encode_accessors.h
-libsz_0_0_la_SOURCES = sz_compat.c
-libaec_0_0_la_LDFLAGS = -version-info 0:0
-libsz_0_0_la_LDFLAGS = -version-info 0:0
+lib_LTLIBRARIES = libsz.la libaec.la
+libaec_la_SOURCES = encode.c encode_accessors.c decode.c encode.h encode_accessors.h
+libsz_la_SOURCES = sz_compat.c libaec.la
+libsz_la_LIBADD = libaec.la
+libaec_la_LDFLAGS = -version-info 0:0
+libsz_la_LDFLAGS = -version-info 0:0
 include_HEADERS = libaec.h szlib.h
 
 bin_PROGRAMS = aec test_szcomp
 
-aec_LDADD = libaec-0.0.la
-test_szcomp_LDADD = $(lib_LTLIBRARIES)
+aec_LDADD = libaec.la
+test_szcomp_LDADD = libsz.la
 
 aec_SOURCES = aec.c
 test_szcomp_SOURCES = test_szcomp.c

diff --git a/src/szlib.h b/src/szlib.h
index 45e7a0c..5d303df 100644 (file)
--- a/src/szlib.h
+++ b/src/szlib.h
@@ -5,7 +5,7 @@
 
 #define SZ_OK AEC_OK
 #define SZ_NO_ENCODER_ERROR -1
-#define SZ_PARAM_ERROR AEC_ERRNO
+#define SZ_PARAM_ERROR AEC_CONF_ERROR
 #define SZ_MEM_ERROR AEC_MEM_ERROR
 #define SZ_OUTBUFF_FULL -2
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3e5f560..b437cc4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,4 +2,4 @@ INCLUDES = -I$(top_srcdir)/src
 TESTS = check_aec
 check_PROGRAMS = check_aec
 check_aec_SOURCES = check_aec.c $(top_builddir)/src/libaec.h
-check_aec_LDADD = $(top_builddir)/src/libaec-0.0.la
+check_aec_LDADD = $(top_builddir)/src/libaec.la