diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | 6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libcrypto/Attic | |
| parent | 509e4c3041a1e04b41603ac8dd4dbc72152b416e (diff) | |
| download | openbsd-6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e.tar.gz openbsd-6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e.tar.bz2 openbsd-6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/Attic')
| -rw-r--r-- | src/lib/libcrypto/Attic/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/Attic/Makefile b/src/lib/libcrypto/Attic/Makefile index c1033f6d77..85d9f249c5 100644 --- a/src/lib/libcrypto/Attic/Makefile +++ b/src/lib/libcrypto/Attic/Makefile | |||
| @@ -74,7 +74,9 @@ x86_64cpuid.s: x86_64cpuid.pl | |||
| 74 | $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@ | 74 | $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@ |
| 75 | ia64cpuid.s: ia64cpuid.S | 75 | ia64cpuid.s: ia64cpuid.S |
| 76 | $(CC) $(CFLAGS) -E ia64cpuid.S > $@ | 76 | $(CC) $(CFLAGS) -E ia64cpuid.S > $@ |
| 77 | ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@ | 77 | ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@ |
| 78 | alphacpuid.s: alphacpuid.pl | ||
| 79 | $(PERL) $< | $(CC) -E - | tee $@ > /dev/null | ||
| 78 | 80 | ||
| 79 | testapps: | 81 | testapps: |
| 80 | [ -z "$(THIS)" ] || ( if echo $(SDIRS) | fgrep ' des '; \ | 82 | [ -z "$(THIS)" ] || ( if echo $(SDIRS) | fgrep ' des '; \ |