diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2012-12-29 13:06:25 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2012-12-31 11:36:51 +0100 |
| commit | c9da66a018b6381eadfa3570d511b2a2341ebae8 (patch) | |
| tree | 92a82327dd72cd93839741fb529f3a51c800ba0d /libqpdf/build.mk | |
| parent | 3680922ae5efbf544afcfa3dd72e2f1db336c45f (diff) | |
| download | qpdf-c9da66a018b6381eadfa3570d511b2a2341ebae8.tar.zst | |
Incorporate sha2 code from sphlib 3.0
Changes from upstream are limited to change #include paths so that I
can place header files and included "c" files in a subdirectory. I
didn't keep the unit tests from sphlib but instead verified them by
running them manually. I will implement the same tests using the
Pl_SHA2 pipeline except that sphlib's sha2 implementation supports
partial bytes, which I will not exercise in qpdf or our tests.
Diffstat (limited to 'libqpdf/build.mk')
| -rw-r--r-- | libqpdf/build.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libqpdf/build.mk b/libqpdf/build.mk index 0ad96a2d..4e0311b0 100644 --- a/libqpdf/build.mk +++ b/libqpdf/build.mk @@ -54,18 +54,27 @@ SRCS_libqpdf = \ libqpdf/QUtil.cc \ libqpdf/RC4.cc \ libqpdf/qpdf-c.cc \ - libqpdf/rijndael.cc + libqpdf/rijndael.cc \ + libqpdf/sha2.c \ + libqpdf/sha2big.c # ----- -OBJS_libqpdf = $(call src_to_lobj,$(SRCS_libqpdf)) +CCSRCS_libqpdf = $(filter %.cc,$(SRCS_libqpdf)) +CSRCS_libqpdf = $(filter %.c,$(SRCS_libqpdf)) + +CCOBJS_libqpdf = $(call src_to_lobj,$(CCSRCS_libqpdf)) +COBJS_libqpdf = $(call c_src_to_lobj,$(CSRCS_libqpdf)) +OBJS_libqpdf = $(CCOBJS_libqpdf) $(COBJS_libqpdf) ifeq ($(GENDEPS),1) -include $(call lobj_to_dep,$(OBJS_libqpdf)) endif -$(OBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.cc +$(CCOBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.cc $(call libcompile,$<,$(INCLUDES_libqpdf)) +$(COBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.c + $(call c_libcompile,$<,$(INCLUDES_libqpdf)) # Last three arguments to makelib are CURRENT,REVISION,AGE. # |