diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-03-26 21:33:18 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-03-31 20:16:01 +0200 |
| commit | dee502be89e78e2979e3bd1d7724cf79daa6ef61 (patch) | |
| tree | 53e97582c488f1a484bd42e570de6a99768fd1df /Makefile.org | |
| parent | 30cd4ff294252c4b6a4b69cbef6a5b4117705d22 (diff) | |
Stop symlinking, move files to intended directory
Rather than making include/openssl/foo.h a symlink to
crypto/foo/foo.h, this change moves the file to include/openssl/foo.h
once and for all.
Likewise, move crypto/foo/footest.c to test/footest.c, instead of
symlinking it there.
Originally-by: Geoff Thorpe <geoff@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Makefile.org b/Makefile.org index 0d09ad4209..5e510f279d 100644 --- a/Makefile.org +++ b/Makefile.org @@ -137,6 +137,7 @@ BASEADDR= DIRS= crypto ssl engines apps test tools ENGDIRS= ccgost SHLIBDIRS= crypto ssl +INSTALL_SUBS= engines apps tools # dirs in crypto to build SDIRS= \ @@ -426,11 +427,6 @@ files: $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO @set -e; target=files; $(RECURSIVE_BUILD_CMD) -links: - @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl - @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) - @set -e; target=links; $(RECURSIVE_BUILD_CMD) - gentests: @(cd test && echo "generating dummy tests (if needed)..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate ); @@ -486,10 +482,10 @@ util/libeay.num:: util/ssleay.num:: $(PERL) util/mkdef.pl ssl update -crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h - $(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h -crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num - $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h +crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl include/openssl/obj_mac.h + $(PERL) crypto/objects/obj_dat.pl include/openssl/obj_mac.h crypto/objects/obj_dat.h +include/openssl/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num + $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num include/openssl/obj_mac.h crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num $(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h @@ -547,12 +543,11 @@ uninstall: uninstall_sw uninstall_docs install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS) - @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + @set -e; for i in include/openssl/*.h; do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$$i ); \ done; - @set -e; target=install; $(RECURSIVE_BUILD_CMD) + @set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ do \ if [ -f "$$i" ]; then \ |