Link in applink with fips_premain_dso

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 8b4de744bdb03ab5f87820b79d0f9bcf20955ffa..aa8776ea0895da15b35e05e99d99144d415b6072 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -184,7 +184,7 @@ WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 

-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
+all: Makefile build_all

 
 # as we stick to -e, CLEARENV ensures that local variables in lower
 # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
 
 # as we stick to -e, CLEARENV ensures that local variables in lower
 # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn


@@ -268,21 +268,25 @@ reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
 sub_all: build_all
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
 sub_all: build_all

+

 build_all: build_libs build_apps build_tests build_tools
 
 build_all: build_libs build_apps build_tests build_tools
 

-build_libs: build_crypto build_ssl build_engines
+build_libs: build_libcrypto build_libssl openssl.pc
+
+build_libcrypto: build_crypto build_engines libcrypto.pc
+build_libssl: build_ssl libssl.pc

 
 build_crypto:
        @dir=crypto; target=all; $(BUILD_ONE_CMD)
 
 build_crypto:
        @dir=crypto; target=all; $(BUILD_ONE_CMD)

-build_ssl:
+build_ssl: build_crypto

        @dir=ssl; target=all; $(BUILD_ONE_CMD)
        @dir=ssl; target=all; $(BUILD_ONE_CMD)

-build_engines:
+build_engines: build_crypto

        @dir=engines; target=all; $(BUILD_ONE_CMD)
        @dir=engines; target=all; $(BUILD_ONE_CMD)

-build_apps:
+build_apps: build_libs

        @dir=apps; target=all; $(BUILD_ONE_CMD)
        @dir=apps; target=all; $(BUILD_ONE_CMD)

-build_tests:
+build_tests: build_libs

        @dir=test; target=all; $(BUILD_ONE_CMD)
        @dir=test; target=all; $(BUILD_ONE_CMD)

-build_tools:
+build_tools: build_libs

        @dir=tools; target=all; $(BUILD_ONE_CMD)
 
 all_testapps: build_libs build_testapps
        @dir=tools; target=all; $(BUILD_ONE_CMD)
 
 all_testapps: build_libs build_testapps


@@ -495,25 +499,28 @@ TABLE: Configure
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.

-tar:
+TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
+                              --owner openssl:0 --group openssl:0 \
+                              --transform 's|^|openssl-$(VERSION)/|' \
+                              -cvf -
+
+../$(TARFILE).list:
+       find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
+              \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
+              \! -name '*test' \! -name '.#*' \! -name '*~' \
+           | sort > ../$(TARFILE).list
+
+tar: ../$(TARFILE).list

        find . -type d -print | xargs chmod 755
        find . -type f -print | xargs chmod a+r
        find . -type f -perm -0100 -print | xargs chmod a+x
        find . -type d -print | xargs chmod 755
        find . -type f -print | xargs chmod a+r
        find . -type f -perm -0100 -print | xargs chmod a+x

-       find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
-       $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
-       tardy --user_number=0  --user_name=openssl \
-             --group_number=0 --group_name=openssl \
-             --prefix=openssl-$(VERSION) - |\
-       gzip --best >../$(TARFILE).gz; \
-       rm -f ../$(TARFILE).list; \
+       $(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
+       rm -f ../$(TARFILE).list

        ls -l ../$(TARFILE).gz
 
        ls -l ../$(TARFILE).gz
 

-tar-snap:
-       @$(TAR) $(TARFLAGS) -cvf - \
-               `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
-       tardy --user_number=0  --user_name=openssl \
-             --group_number=0 --group_name=openssl \
-             --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
+tar-snap: ../$(TARFILE).list
+       $(TAR_COMMAND) > ../$(TARFILE)
+       rm -f ../$(TARFILE).list

        ls -l ../$(TARFILE)
 
 dist:   
        ls -l ../$(TARFILE)
 
 dist: