Merge branch 'master' of github.com:divVerent/d0_blind_id

Conflicts:
	Makefile.am

diff --combined Makefile.am
index f8b1165ea21818a11814b125f9eefe67f68ccd22,19092c36515400d79e3eff70ea47a217cf53e690..89a0886e0bd276738a129c60f56df9b91d3df160
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -2,19 -2,27 +2,29 @@@ ACLOCAL_AMFLAGS = -I m
  
  bin_PROGRAMS = blind_id
  blind_id_SOURCES = main.c
- blind_id_LDADD = libblind_id.la
+ blind_id_LDADD = libd0_blind_id.la
  
- lib_LTLIBRARIES = libblind_id.la
- libblind_id_la_SOURCES = d0_bignum-gmp.c d0_blind_id.c d0.c d0_iobuf.c sha1.c \
-                          d0_bignum.h     d0_blind_id.h d0.h d0_iobuf.h sha1.h
- libblind_id_la_LDFLAGS = -versioninfo 0:0:0
- libblind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ lib_LTLIBRARIES = libd0_blind_id.la
  # versioninfo:
  #   - compatible interface change: c:r:a -> c+1:0:a+1
  #   - incompatible interface change: c:r:a -> c+1:0:0
  #   - internal change: c:r:a -> c:r+1:a
  
 -libd0_blind_id_la_SOURCES = d0_bignum-gmp.c d0_blind_id.c d0.c d0_iobuf.c sha2.c
++libd0_blind_id_la_SOURCES = d0_bignum-gmp.c d0_blind_id.c d0.c d0_iobuf.c sha2.c \
++                            d0_bignum-gmp.h d0_blind_id.h d0.h d0_iobuf.h sha2.h
+ libd0_blind_id_la_LDFLAGS = -versioninfo 2:0:2
+ libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
  library_includedir = $(includedir)/d0_blind_id
  library_include_HEADERS = d0_blind_id.h d0.h
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_HEADERS = d0_blind_id.pc
 -libd0_rijndael_la_SOURCES = d0_rijndael.c
+ 
+ if ENABLE_RIJNDAEL
+ lib_LTLIBRARIES += libd0_rijndael.la
++libd0_rijndael_la_SOURCES = d0_rijndael.c \
++                            d0_rijndael.h
+ libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0
+ libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_include_HEADERS += d0_rijndael.h
+ pkgconfig_HEADERS += d0_rijndael.pc
+ endif