From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 11 Aug 2010 11:51:49 +0000 (+0200)
Subject: Merge branch 'master' of github.com:divVerent/d0_blind_id
X-Git-Tag: xonotic-v0.1.0preview~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4145420d34f05696e610e2f414874312ad572479;p=xonotic%2Fd0_blind_id.git

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

Conflicts:
	Makefile.am
---

4145420d34f05696e610e2f414874312ad572479
diff --cc Makefile.am
index f8b1165,19092c3..89a0886
--- a/Makefile.am
+++ b/Makefile.am
@@@ -14,7 -10,19 +10,21 @@@ lib_LTLIBRARIES = libd0_blind_id.l
  #   - 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
+ 
+ if ENABLE_RIJNDAEL
+ lib_LTLIBRARIES += libd0_rijndael.la
 -libd0_rijndael_la_SOURCES = d0_rijndael.c
++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